From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 23:31:35 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2^0
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0815218dbf625450b2f8eba6fd44ac8d8c065a95;p=dana%2Fopenbox.git

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

0815218dbf625450b2f8eba6fd44ac8d8c065a95