tree d1456b3c7ef6ad80f59439222828cce4e0d9ac60
parent 746973186764292a84d11856ac315fa4b62957ad
author Glenn Kasten <gkasten@google.com> 1268754084 -0700
committer Glenn Kasten <gkasten@google.com> 1268756277 -0700

Fixes bug 2502132, and masks bug 2518313.

Change-Id: I5c5ecf1c10763f7b3f3d1e5c57dc5ce77cc344fd