Sample clean up and bug fixing.
Authored by: cnewman@akamai.com 2009-10-27
Parent: [r374]
Child: [r376]