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

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

78d83a885466db7b8999e0a9309d2b47dcf531be