merge r6766-6767 from trunk
authorDana Jansens <danakj@orodu.net>
Tue, 22 May 2007 20:51:37 +0000 (20:51 +0000)
committerDana Jansens <danakj@orodu.net>
Tue, 22 May 2007 20:51:37 +0000 (20:51 +0000)
commitde81508299bbd1eff15a7edd12fee13f4d7a2e3c
tree11c056e037e59cdc1ad5572e0341fd8b2be4fa3a
parentaa69d792daaec895ce393783504889d0da75670c
merge r6766-6767 from trunk
openbox/event.c
openbox/openbox.c