Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 22:25:13 +0000 (17:25 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 22:25:13 +0000 (17:25 -0500)
commita1e446a21e19c936771800c76baba2a9c8389ac6
treec4f017ab3fa773bd3b32b5a0cd1ae122ca5e55e1
parenta210ef2f2e4dad71a2874db61add54cffabf19bb
parentf542c5143ac115937c5ee8f3a229e557383cd180
Merge branch 'backport' into 3.4-working

Conflicts:

openbox/openbox.h
openbox/openbox.c
openbox/openbox.h