From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 Dec 2009 15:32:40 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.9~5
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=91acbb2177fea09053980caddfac6da05859a301;p=mikachu%2Fopenbox.git

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

91acbb2177fea09053980caddfac6da05859a301