From: Mikael Magnusson <mikachu@comhem.se>
Date: Thu, 27 Mar 2008 13:56:33 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.7-pre3~2
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=0534fa498cbc0c4f435d70598b736d5e46863ba3

Merge branch 'backport' into 3.4
---

0534fa498cbc0c4f435d70598b736d5e46863ba3