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

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

a5b6a10c73671b6162ee2de0b411249da2e25521