merge r5876-5881 from trunk
authorDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 18:39:54 +0000 (18:39 +0000)
committerDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 18:39:54 +0000 (18:39 +0000)
commitf32ceb329623ee3a0a65b6cfc7ded4bb0c55642a
treec26166e30fef7108ffbc64a2c91edf33d963a2c4
parent467f47d5bbe6a44b8b2a6458108d2a9a2879435e
merge r5876-5881 from trunk
openbox/action.c
openbox/config.c
openbox/config.h