From: Dana Jansens <danakj@orodu.net>
Date: Fri, 20 Jul 2007 20:01:10 +0000 (-0400)
Subject: Merge commit 'mika/master'
X-Git-Tag: release-3.4.3~14^2~7
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1307fb6ca76fe4f6e246806678d9a41847f9ecfb;p=dana%2Fopenbox.git

Merge commit 'mika/master'
---

1307fb6ca76fe4f6e246806678d9a41847f9ecfb