From: Mikael Magnusson <mikachu@comhem.se>
Date: Tue, 18 Dec 2007 20:12:52 +0000 (+0100)
Subject: Merge branch 'backport'
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=2b8b5da04b14af1639143cc332874c7e1a03a8bb;p=chaz%2Fopenbox

Merge branch 'backport'
---

2b8b5da04b14af1639143cc332874c7e1a03a8bb