merge r6895-6896 from trunk
authorDana Jansens <danakj@orodu.net>
Sat, 26 May 2007 19:51:20 +0000 (19:51 +0000)
committerDana Jansens <danakj@orodu.net>
Sat, 26 May 2007 19:51:20 +0000 (19:51 +0000)
commit8a85b2bddaaf5dea466a5dc84b022c0ad8b6e6d3
tree3215fee5d37ae77f268ff70a28c62d67452d11ac
parent578cf8321f6f32d6b9ad9b397d43c02f94e7383f
merge r6895-6896 from trunk
openbox/frame.c