Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Wed, 19 Nov 2008 16:42:33 +0000 (17:42 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 19 Nov 2008 16:42:33 +0000 (17:42 +0100)
1  2 
openbox/frame.c

diff --cc openbox/frame.c
Simple merge