From: Mikael Magnusson <mikachu@gmail.com>
Date: Fri, 14 May 2010 13:52:18 +0000 (+0200)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.11.2~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=714bed593263b2f75db463da3ec63e391e71a462;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4
---

714bed593263b2f75db463da3ec63e391e71a462