This commit was manufactured by cvs2svn to create branch
'unlabeled-1.2.2'.

[SVN r9019]
This commit was manufactured by cvs2svn to create branch
'unlabeled-1.2.2'.

[SVN r20932]
Bring branch up-to-date with trunk


[SVN r21992]