1. 255af73 Merge 2.0-maven branch into trunk. by sberlin@gmail.com ยท 14 years ago