From: Dana Jansens <danakj@orodu.net>
Date: Fri, 5 Feb 2010 18:47:58 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Tag: release-3.5.1~363
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=31f0c8c1ad8c9acf369ab8336765f4bf673b8e21;p=mikachu%2Fopenbox.git

Merge branch 'backport' into work
---

31f0c8c1ad8c9acf369ab8336765f4bf673b8e21