From: Dana Jansens <danakj@orodu.net>
Date: Wed, 6 Feb 2008 14:22:29 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre1~19
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=98a50ff0f9add10926b5a77628582a171e2e74dd;p=mikachu%2Fopenbox.git

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

98a50ff0f9add10926b5a77628582a171e2e74dd