Merge branch 'mikabox/maybe' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:29:33 +0000 (17:29 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:29:33 +0000 (17:29 +0100)
1  2 
openbox/config.c

Simple merge