Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Tue, 22 Dec 2009 14:31:00 +0000 (09:31 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 22 Dec 2009 14:31:00 +0000 (09:31 -0500)
1  2 
Makefile.am
data/rc.xml

diff --cc Makefile.am
Simple merge
diff --cc data/rc.xml
Simple merge