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

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

64c5a78cb3c06b0744e9dbf7fc85f02e264094a2