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

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

a6098952b81cf3d266c44e67b2b3a9aa026188f0