ref: e96c1e8dfbcceae3dcf26c517af32fd9985e41ad
parent: 319404f4f1fc63ce4169974b5c7ddcaa8cd1998b
parent: 32817d6fbe5169413ea05e33bf5a509fcf9f4218
author: John Koleszar <jkoleszar@google.com>
date: Thu Jun 2 20:05:17 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD