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

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

e236e0160e0ea5d28062662caf4dd0f8f1aee65d