ref: 9d325df746cd79f434cea45768b38dc49b61e3aa
parent: 5944829d6d26d0d3c090badf5149d8a7a61659e7
parent: b93faff5a017500f131bdce3777b4774d47e6641
author: John Koleszar <jkoleszar@google.com>
date: Wed Apr 27 20:05:06 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD