From: Dana Jansens <danakj@orodu.net>
Date: Sun, 3 Feb 2008 23:39:08 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6.1~3
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=565f14acc02d8b12734263e292974f90503246b2;p=mikachu%2Fopenbox.git

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

565f14acc02d8b12734263e292974f90503246b2