From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Dec 2009 21:48:23 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.9~2
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=997bc9947537e1e49827648ea6a17067de5f09c9;p=dana%2Fopenbox.git

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

997bc9947537e1e49827648ea6a17067de5f09c9