From: Dana Jansens <danakj@orodu.net>
Date: Thu, 14 Feb 2008 20:14:41 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Tag: xkb~140
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=b01dd0b20fedb27681ceda53deb8c7f2f83eabc3

Merge branch 'backport' into work
---

b01dd0b20fedb27681ceda53deb8c7f2f83eabc3