From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 18:37:44 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2~5
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=a210ef2f2e4dad71a2874db61add54cffabf19bb

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

a210ef2f2e4dad71a2874db61add54cffabf19bb