This commit was manufactured by cvs2svn to create branch
'iter-adaptor-and-categories'.
updated for change in named params
updated for changes in named params
removed debugging cruft (foo() and struct bar)