merge r5897 from trunk
authorDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 21:09:33 +0000 (21:09 +0000)
committerDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 21:09:33 +0000 (21:09 +0000)
commita0f92b9c67522c3f951146b9f2055e23fd934bed
treed35bcee66261d35fab0e392430c8efc00a82e068
parentc269eb86ce89a974a4a36518796f19ef41527242
merge r5897 from trunk
openbox/openbox.c
openbox/screen.c