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

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

2edcf596f54c633a21462936cfe5cbd332d82b6f