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

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

6c96adb319d7de8e1cdbb1c41f7398aec08d1338