Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:14:55 +0000 (15:14 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:14:55 +0000 (15:14 -0500)
1  2 
openbox/config.c

Simple merge