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

svn path=; revision=20932
Bring branch up-to-date with trunk

svn path=; revision=21992
Removed old branches.

svn path=; revision=38550