Merge branch 'release-1.0'
authorJustin Wind <justin.wind@gmail.com>
Wed, 12 Dec 2012 20:35:08 +0000 (12:35 -0800)
committerJustin Wind <justin.wind@gmail.com>
Wed, 12 Dec 2012 20:35:08 +0000 (12:35 -0800)

Trivial merge