Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 31 Jan 2008 22:32:37 +0000 (17:32 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 31 Jan 2008 22:32:37 +0000 (17:32 -0500)
1  2 
openbox/client.c

Simple merge