Merge branch 'master' into css
authorDan Vanderkam <danvk@google.com>
Fri, 15 Jul 2011 20:52:06 +0000 (16:52 -0400)
committerDan Vanderkam <danvk@google.com>
Fri, 15 Jul 2011 20:52:06 +0000 (16:52 -0400)

Trivial merge