From: Dana Jansens <danakj@orodu.net>
Date: Tue, 22 Dec 2009 14:31:00 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.10~3
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=31e977e8c37081f324e1b4ca0e3a58af48890ac4;p=dana%2Fopenbox.git

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

31e977e8c37081f324e1b4ca0e3a58af48890ac4