From: Dana Jansens <danakj@orodu.net>
Date: Thu, 19 Jul 2007 18:01:49 +0000 (-0400)
Subject: Merge branch 'master' into 3.4-working
X-Git-Tag: release-3.4.3~29
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2328486d1428935b4cb45b4b9d4337d6dcb6b9b8;p=dana%2Fopenbox.git

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

2328486d1428935b4cb45b4b9d4337d6dcb6b9b8