From: Dana Jansens <danakj@orodu.net>
Date: Sun, 20 Jan 2008 06:36:43 +0000 (-0500)
Subject: Merge branch 'backport'
X-Git-Tag: release-3.5.0~448
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=98dda05c4ae1372391a26fca4c5a8b0551bbb4f9;p=dana%2Fopenbox.git

Merge branch 'backport'
---

98dda05c4ae1372391a26fca4c5a8b0551bbb4f9