Merge branch 'master' into highlight-stacked
authorKlaus Weidner <klausw@google.com>
Fri, 2 Mar 2012 18:40:14 +0000 (10:40 -0800)
committerKlaus Weidner <klausw@google.com>
Fri, 2 Mar 2012 18:40:14 +0000 (10:40 -0800)

Trivial merge