Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 21 Feb 2008 18:24:19 +0000 (13:24 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 21 Feb 2008 18:24:19 +0000 (13:24 -0500)
Conflicts:

openbox/openbox.c
openbox/session.c


No differences found