Merge branch 'backport' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sun, 5 Jul 2009 11:17:00 +0000 (13:17 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Sun, 5 Jul 2009 11:17:00 +0000 (13:17 +0200)
1  2 
openbox/screen.c

Simple merge