Merge branch 'master' into highlight-NaN-2
authorKlaus Weidner <klausw@google.com>
Tue, 28 Feb 2012 18:34:57 +0000 (10:34 -0800)
committerKlaus Weidner <klausw@google.com>
Tue, 28 Feb 2012 18:34:57 +0000 (10:34 -0800)

Trivial merge