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

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

94c1efa867547f0aa8bc8fa2dbc203b3f6b81bef