Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1
Vasu Nori [Thu, 17 Mar 2011 22:37:04 +0000 (15:37 -0700)]

Trivial merge