From: Dana Jansens <danakj@orodu.net>
Date: Sun, 10 Feb 2008 00:07:55 +0000 (-0500)
Subject: Merge branch 'backport'
X-Git-Tag: release-3.5.0~364
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3167fc223ea82851ae954b348a5ff1c0ce6b6d79;p=dana%2Fopenbox.git

Merge branch 'backport'
---

3167fc223ea82851ae954b348a5ff1c0ce6b6d79