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

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

491b7f2ef588b7230d859a4f28e0928cdf31fa72