merge r6892-6893 from trunk
authorDana Jansens <danakj@orodu.net>
Sat, 26 May 2007 17:36:34 +0000 (17:36 +0000)
committerDana Jansens <danakj@orodu.net>
Sat, 26 May 2007 17:36:34 +0000 (17:36 +0000)
commit578cf8321f6f32d6b9ad9b397d43c02f94e7383f
tree3f767ffa57d544ea436fe800f43774ed12c4210a
parent7981acb1d18682cd41e3eb67c4395d2e8cdd39f4
merge r6892-6893 from trunk
openbox/client.c
render/image.c