ref: d90b1ee16cb13f3b868efc5b084b33a65000689e
parent: 063d68b7eae642996c7fe7af38709c2f1029f091
parent: 3cc5b92c6516aac4c3f9bf27974bd8543b286251
author: Paul Wilkins <paulwilkins@google.com>
date: Mon Feb 27 12:58:12 EST 2012
Merge "Further code simplification and clean up." into experimental