* TODO-1.6: Revert my removal of an item in r34170 as I didn't check that Greg has finished it, although I checked that the original problem is fixed.
* TODO-1.6: Revert my removal of an item in r34170 as I didn't
check that Greg has finished it, although I checked that the original
problem is fixed.

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