Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 18:57:05 +0000 (14:57 -0400)
committerDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 18:57:05 +0000 (14:57 -0400)
1  2 
openbox/frame.c

diff --cc openbox/frame.c
Simple merge