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

svn path=; revision=8508
Cleanup after join with HEAD

svn path=; revision=9445