From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 29 Oct 2008 12:48:45 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~12
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0b15e37d7eed5e069b4ed374ce9496ee8cfb8e0d;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

0b15e37d7eed5e069b4ed374ce9496ee8cfb8e0d