2011-08-12 Andrei Popescu <andreip@google.com>