Merge branch 'common-types' into pristine
authorRobert Bradshaw <robertwb@gmail.com>
Tue, 27 Aug 2013 03:33:55 +0000 (20:33 -0700)
committerRobert Bradshaw <robertwb@gmail.com>
Tue, 27 Aug 2013 03:33:55 +0000 (20:33 -0700)

Trivial merge