From: Dana Jansens <danakj@orodu.net>
Date: Thu, 28 Feb 2008 02:04:16 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre1~4
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3dc3e1154797ddeec31ab49eea3ea05a9bb080a9;p=dana%2Fopenbox.git

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

3dc3e1154797ddeec31ab49eea3ea05a9bb080a9