Merge branch 'master' of git://orodu.net/openbox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 21 Jul 2007 19:49:49 +0000 (21:49 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 21 Jul 2007 19:49:49 +0000 (21:49 +0200)

Trivial merge