* CHANGES:  make /trunk's copy match 1.0.x branch's copy.
* CHANGES:  make /trunk's copy match 1.0.x branch's copy.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion