Update version number to 2.6.1. 

Update CHANGES.txt to include a bug fix. 

merge 2.6.0 to trunk