From: Dana Jansens <danakj@orodu.net>
Date: Sat, 2 Feb 2008 06:26:36 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6~9
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2c1f961d3484f1c84850bb885771243fc522a963;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4-working
---

2c1f961d3484f1c84850bb885771243fc522a963