ref: 8cfb70c3d4a05b5dfe495cba30b988a1d4ebf1c3
parent: 4d98741c618db5c12b4d92ecda8ff0e1331a8868
parent: 1e2ab6ace0780d17320e0fcd7d05941fc2298868
author: John Koleszar <jkoleszar@google.com>
date: Thu Dec 30 19:05:25 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD