Merge branch 'type-expansion'
authorAlejandro R Sedeño <asedeno@google.com>
Wed, 12 Dec 2012 18:40:59 +0000 (13:40 -0500)
committerAlejandro R Sedeño <asedeno@google.com>
Wed, 12 Dec 2012 18:40:59 +0000 (13:40 -0500)

Trivial merge