merge r6118-6132 from trunk
authorDana Jansens <danakj@orodu.net>
Mon, 7 May 2007 02:53:22 +0000 (02:53 +0000)
committerDana Jansens <danakj@orodu.net>
Mon, 7 May 2007 02:53:22 +0000 (02:53 +0000)
commitaae204263a507b976cb751c0896937d143f4a1aa
tree8f0644c40c0db63c2301eba5e296af2bcec626f5
parent644aafc983233b8ee30e13ecd8496a9654df6c9c
parent24c0d618471276fd514cd666bc7067d30be8d0ca
merge r6118-6132 from trunk
Makefile.am
data/themerc.xsd