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

Merge branch 'backport'
---

3ae58f457bcdfa90b26dad4c9d192f045874ddae