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

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

c64c8307fd2518a21431fef541d809cc206a8e28