From: Dana Jansens <danakj@orodu.net>
Date: Sat, 2 Feb 2008 15:48:22 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6~4
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0846df414d1cb7ecaa596c275b8f5c8926a2879b;p=mikachu%2Fopenbox.git

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

0846df414d1cb7ecaa596c275b8f5c8926a2879b