ref: f00a237a43b86298f18ff9f09c29c4cf965f6d04
parent: c3a56ee583cab0e131adab671e3b80a66a79ac92
parent: 2fc927c66a6e716bedba35db8a74cbb3b6f3d223
author: Dmitry Kovalev <dkovalev@google.com>
date: Fri Jul 19 12:14:21 EDT 2013
Merge "Fixing problem introduced in one of my previous commits."