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

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

a4992a9a021746f70de1b6ab179e9970ab698d86