From: Mikael Magnusson <mikachu@gmail.com>
Date: Fri, 20 Feb 2009 16:42:48 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~3
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0d18eb862a79702f3682feebe5567c4a3c768e72;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

0d18eb862a79702f3682feebe5567c4a3c768e72