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

Merge branch 'master' into 3.4
---

2d2062801212e8dd0a18774b17b9ab63d6fdfd19