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

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

1ad76cee19d5b34fa62a2d713a3b6ebaa8140ab4