From: Dana Jansens <danakj@orodu.net>
Date: Mon, 8 Feb 2010 19:28:04 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.11.1~32
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=db8fadba4cf336c127d55dcce3c0a2e193f8ce14;p=dana%2Fopenbox.git

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

db8fadba4cf336c127d55dcce3c0a2e193f8ce14