From: Dana Jansens <danakj@orodu.net>
Date: Thu, 7 Jan 2010 18:26:28 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.10~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=70eb0f2af6abe5465e37d12969403691e534c9b6;p=dana%2Fopenbox.git

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

70eb0f2af6abe5465e37d12969403691e534c9b6