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

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

5a17132a78ae63dbc5f878c8baab459eedc47ea8