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

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

f334cac356c6766b1a80e50fb88dff7119434a7d