From: Mikael Magnusson <mikachu@comhem.se>
Date: Tue, 15 Apr 2008 16:18:09 +0000 (+0200)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.7~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4a35ac31e5544cb692ce16cb7f7248a18c6a2337;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

4a35ac31e5544cb692ce16cb7f7248a18c6a2337