Merge branch 'backport'
authorDana Jansens <danakj@orodu.net>
Sun, 20 Jan 2008 04:59:40 +0000 (23:59 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 20 Jan 2008 04:59:40 +0000 (23:59 -0500)
1  2 
data/rc.xml

diff --cc data/rc.xml
Simple merge