Merge remote branch 'goog/ics-mr0' into ics-mr1
Ed Heyl [Tue, 25 Oct 2011 19:50:42 +0000 (19:50 +0000)]

Trivial merge