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

Merge branch 'master' into 3.4
---

80658c90ccb0e79b3d5068c32c1802b0b32a35b0