[SVN r22121]
[SVN r21006]
changes elsewhere. boost/iterator and libs/iterator/test were updated from branch "simplify" [SVN r20905]
[SVN r18958]