From: Dana Jansens <danakj@orodu.net>
Date: Mon, 8 Feb 2010 18:42:46 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.11~2
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=18da1e587913018c02aeff36feb30f49527f20ea;p=dana%2Fopenbox.git

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

18da1e587913018c02aeff36feb30f49527f20ea