From: Dana Jansens <danakj@orodu.net>
Date: Fri, 25 Jan 2008 01:52:06 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6~16
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=20b9352dd07f8161b6ea6cda704ba175f74f05b0;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4-working
---

20b9352dd07f8161b6ea6cda704ba175f74f05b0