From: Dana Jansens <danakj@orodu.net>
Date: Fri, 25 Jan 2008 05:49:50 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6~11
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=d025ad54fd1f79191aafe7a86b7621d7624f2683;p=mikachu%2Fopenbox.git

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

d025ad54fd1f79191aafe7a86b7621d7624f2683