Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@comhem.se>
Tue, 15 Apr 2008 16:18:09 +0000 (18:18 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Tue, 15 Apr 2008 16:18:09 +0000 (18:18 +0200)
1  2 
openbox/config.c

Simple merge