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

Merge branch 'backport' into 3.4-working

Conflicts:

	po/no.po
---

28ea97df6587b8e60efe11dbf152dc098510b62c