merge r7194 from trunk
authorDana Jansens <danakj@orodu.net>
Thu, 31 May 2007 23:07:43 +0000 (23:07 +0000)
committerDana Jansens <danakj@orodu.net>
Thu, 31 May 2007 23:07:43 +0000 (23:07 +0000)
commita0c6f39e46b58a11c8e937b94b326e8762f024a1
treefad5173b135ec1b0a113546ffc5273b91099993d
parentbc3a4af012311edabdc2e0eb3cea2c5ba6309353
merge r7194 from trunk
openbox/openbox.c