ref: 601bab4fdeb4191474bbd3337c64a622b81e968a
parent: d27ae7b6a56f89df21dd15d11dd1b1ca76b37c0a
parent: 2b96ffe025673a6943476989a689df938df7523b
author: Yaowu Xu <yaowu@google.com>
date: Mon May 27 11:16:21 EDT 2013
Merge "a few clean-ups" into experimental