merge r5872,5873 from trunk
authorDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 15:32:04 +0000 (15:32 +0000)
committerDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 15:32:04 +0000 (15:32 +0000)
commit3faf70e5d834ea385d5da91928d47f1fdb077ef1
tree6dd2e29b573808dbf0348c1d2c95a064c595994f
parent8a805e99c8390cd6ea8caf6d8030a4099ff168a3
merge r5872,5873 from trunk
openbox/client.c
openbox/place.c