From: Mikael Magnusson <mikachu@gmail.com>
Date: Sat, 13 Mar 2010 21:04:27 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.11.1~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2cc9a77800620673afd99ef79bf7d5598ee417d8;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4
---

2cc9a77800620673afd99ef79bf7d5598ee417d8