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

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

ace5d151fe1cffc225931d35e482d9273229cde3