From: Mikael Magnusson <mikachu@gmail.com>
Date: Thu, 29 Jan 2009 21:46:04 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~5
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=dd4ea774f80723518f8df87e0892213dd504ec97

Merge branch 'backport' into 3.4
---

dd4ea774f80723518f8df87e0892213dd504ec97