From: Mikael Magnusson <mikachu@gmail.com>
Date: Mon, 10 Nov 2008 22:38:58 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~8
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=6b0025dd51239363ba28f81578e8ce83d7c5b946;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

6b0025dd51239363ba28f81578e8ce83d7c5b946