From: Dana Jansens <danakj@orodu.net>
Date: Tue, 8 Dec 2009 19:23:52 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.8~3
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=36d192cbeeb61e98c20708f010e0676dc5716e0c;p=mikachu%2Fopenbox.git

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

36d192cbeeb61e98c20708f010e0676dc5716e0c