Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Wed, 5 Nov 2008 18:34:50 +0000 (19:34 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 5 Nov 2008 18:34:50 +0000 (19:34 +0100)
1  2 
openbox/client.c

Simple merge