Merge branch 'master' of git://mikachu.ath.cx/openbox
authorDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 13:11:17 +0000 (09:11 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 13:11:17 +0000 (09:11 -0400)

Trivial merge