From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 19 Nov 2008 16:42:33 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~6
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=080d6fdd31f873e8727ccae060cad7fa73108473

Merge branch 'backport' into 3.4
---

080d6fdd31f873e8727ccae060cad7fa73108473