Merge branch 'master' of git://orodu.net/openbox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 14 Jul 2007 13:25:41 +0000 (15:25 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 14 Jul 2007 13:25:41 +0000 (15:25 +0200)

Trivial merge