This commit was manufactured by cvs2svn to create branch
'unlabeled-1.2.2'.
Bring branch up-to-date with trunk