Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Fri, 15 Feb 2008 15:02:07 +0000 (10:02 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 15 Feb 2008 15:03:55 +0000 (10:03 -0500)
commitdb49122dece88956856606fe4c17158859f81837
tree8e6e7169fe867f9829f5e40837f5b3a297c95771
parentbeae040a8145e4dbe5444720152b9176660433d8
parent4b71209ec89902e2f88522603deeab8b240b34c3
Merge branch 'backport' into work

Conflicts:

openbox/frame.c
openbox/menuframe.c
obt/prop.c
obt/prop.h
openbox/frame.c
openbox/menuframe.c