ref: a3664258c5cb8295c128c157bf73363434635960
parent: be83ef3104311fd507108e93a07b75f08d937e46
parent: be07485e9a9dec736d3619fc7e39657e55415bca
author: Dmitry Kovalev <dkovalev@google.com>
date: Thu Jun 27 10:57:07 EDT 2013
Merge "General cleanup in segmentation-related code."