From: Dana Jansens <danakj@orodu.net>
Date: Sat, 21 Nov 2009 21:56:17 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.8~6
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=af96cbfca0b85ff150fd685c233f44c7b1b5e6b4;p=dana%2Fopenbox.git

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

af96cbfca0b85ff150fd685c233f44c7b1b5e6b4