This commit was manufactured by cvs2svn to create branch
'iter-adaptor-and-categories'.

[SVN r10453]
updated for change in named params


[SVN r10456]
updated for changes in named params


[SVN r10457]
removed debugging cruft (foo() and struct bar)


[SVN r10459]