From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 5 Nov 2008 18:34:50 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~10
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=268cf90926d34092ab0540242741eea07c28527f;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

268cf90926d34092ab0540242741eea07c28527f