From: Dana Jansens <danakj@orodu.net>
Date: Fri, 2 May 2008 17:44:26 +0000 (-0400)
Subject: Merge branch 'backport' into work
X-Git-Tag: mikabox-3.4.7.2~37^2~2
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=169aea6a2dc2d250441ec22e75a5b54252ac6170;p=mikachu%2Fopenbox.git

Merge branch 'backport' into work
---

169aea6a2dc2d250441ec22e75a5b54252ac6170