merged changes with the trunk after patch on assignment (only cosmetic changes)

svn path=; revision=84594