From: Dana Jansens <danakj@orodu.net>
Date: Sun, 22 Jul 2007 14:20:39 +0000 (-0400)
Subject: Merge branch 'master' into 3.4-working
X-Git-Tag: release-3.4.3~4
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=eba1c77261049a8398c777c448d8978d0a1e26bc;p=dana%2Fopenbox.git

Merge branch 'master' into 3.4-working
---

eba1c77261049a8398c777c448d8978d0a1e26bc