From: Dana Jansens <danakj@orodu.net>
Date: Sat, 2 Feb 2008 14:07:10 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6~5
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2bb9e8c6720a41a12fab0acf2cf79848481d9bd2;p=mikachu%2Fopenbox.git

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

2bb9e8c6720a41a12fab0acf2cf79848481d9bd2