Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Wed, 16 Dec 2009 20:37:36 +0000 (15:37 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 16 Dec 2009 20:37:36 +0000 (15:37 -0500)
1  2 
openbox/screen.h

Simple merge