Merge branch 'master' of git://mikachu.ath.cx/openbox into 3.4
authorDana Jansens <danakj@orodu.net>
Mon, 16 Jul 2007 13:58:33 +0000 (09:58 -0400)
committerDana Jansens <danakj@orodu.net>
Mon, 16 Jul 2007 13:58:33 +0000 (09:58 -0400)

Trivial merge