From: Dana Jansens <danakj@orodu.net>
Date: Sat, 4 Aug 2007 21:40:05 +0000 (-0400)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.4
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f05e630d823d6b5a9469bcccabeba88546a9a9ee;p=dana%2Fopenbox.git

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

19b480c1b9b87d34e6fd0612407ec42bf3e0962f