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

Merge branch 'backport' into work
---

ceb77efdd44e993b1ed4e9d908f93baf22b2b22c