From: Dana Jansens <danakj@orodu.net>
Date: Thu, 28 Feb 2008 06:21:02 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2~13
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=49ef99a9e582380874e204149065a43a784f82fd

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

49ef99a9e582380874e204149065a43a784f82fd