merge r5923 from trunk
authorMikael Magnusson <mikachu@comhem.se>
Wed, 25 Apr 2007 15:45:36 +0000 (15:45 +0000)
committerMikael Magnusson <mikachu@comhem.se>
Wed, 25 Apr 2007 15:45:36 +0000 (15:45 +0000)
commit05dcac558db4c581b28676b8fbf8371872945585
treeb553b0d7f5c29d4ceef05afdc58cf7155a4ac0cc
parentcecd632075eb5cad24b9d73e42eaed2f1a16d2fe
merge r5923 from trunk
data/rc.xml.in
openbox/config.c