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

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

f47b874fa57b4b83420d545d413aa75a1850320b