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

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

2d4303156a5b9b66d614e8832605bd6c3a9b9937