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

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

0aef0d3fe63b76c46d1b6cd44e196a5f668e2e5f