From: Dana Jansens <danakj@orodu.net>
Date: Tue, 12 Jan 2010 15:11:01 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.11~13
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e6bd02e9d317d821f5f671824d95a8269b49a7a4;p=dana%2Fopenbox.git

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

e6bd02e9d317d821f5f671824d95a8269b49a7a4