From: Dana Jansens <danakj@orodu.net>
Date: Sat, 12 Jan 2008 02:44:23 +0000 (-0500)
Subject: Merge commit 'mika/backport' into backport
X-Git-Tag: buttons~20
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=fe11937661b891d7d7f2f4224eb956623fe518fb;p=dana%2Fopenbox.git

Merge commit 'mika/backport' into backport
---

fe11937661b891d7d7f2f4224eb956623fe518fb