Addressed Sverre's commits on the previous commit.
Addressed Sverre's commits on the previous commit.

Patch by: Todd Larsen
Review by: Sverre Rabbelier
Review issue: 282
Review URL: http://codereviews.googleopensourceprograms.com/282

--HG--
extra : convert_revision : svn%3A32761e7d-7263-4528-b7be-7235b26367ec/trunk%40377

SRabbelier/Melange,SRabbelier/Melange,SRabbelier/Melange,SRabbelier/Melange,SRabbelier/Melange,SRabbelier/Melange,SRabbelier/Melange,SRabbelier/Melange,SRabbelier/Melange