merge r7241
authorMikael Magnusson <mikachu@comhem.se>
Fri, 1 Jun 2007 21:37:10 +0000 (21:37 +0000)
committerMikael Magnusson <mikachu@comhem.se>
Fri, 1 Jun 2007 21:37:10 +0000 (21:37 +0000)
commit6e2b02951fe580f3709a464719647015543d40a2
tree39544e0bae5577344533ca0366043a125c30bd87
parent5f80c1551640092204c02d510ad28764ead7f48c
merge r7241
openbox/client.c