From: Dana Jansens <danakj@orodu.net>
Date: Wed, 9 Dec 2009 22:07:42 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.9~6
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7ab904b8873ec19109fc76a7c98878fe461a629a;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/screen.h
---

7ab904b8873ec19109fc76a7c98878fe461a629a