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)
commit31e977e8c37081f324e1b4ca0e3a58af48890ac4
treebce5402a7fea41ecd4c973803440420896e9b333
parent91656178840e7ae8a77974fb6bf325407b29d369
parent6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3
Merge branch 'backport' into 3.4-working
Makefile.am
data/rc.xml