Wiping this out so 1.2.1 can be the new trunk (not merging)
Authored by: adustman 2006-04-02
Parent: [r436]
Child: [r438]