merge r6994 from trunk
authorDana Jansens <danakj@orodu.net>
Mon, 28 May 2007 04:26:44 +0000 (04:26 +0000)
committerDana Jansens <danakj@orodu.net>
Mon, 28 May 2007 04:26:44 +0000 (04:26 +0000)
commit49eceee77126f1f5f9ca578f61337b17dd1a0556
tree6a6fe8dfc909059ed094807f3b8f55837fd112ce
parent5b18f5922c9b7147ef9f7766c3d3e204d7792b07
merge r6994 from trunk
openbox/client.c
openbox/openbox.c