Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Wed, 6 Feb 2008 14:22:29 +0000 (09:22 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 6 Feb 2008 14:22:29 +0000 (09:22 -0500)
1  2 
data/rc.xml
data/rc.xsd

diff --cc data/rc.xml
Simple merge
diff --cc data/rc.xsd
Simple merge