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

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

4a8a9b6debbe98822e849d6ae4976137514a1a08