Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Fri, 15 Feb 2008 06:07:54 +0000 (01:07 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 15 Feb 2008 06:07:54 +0000 (01:07 -0500)
1  2 
openbox/frame.c

diff --cc openbox/frame.c
Simple merge