Merge branch 'release-1.0' into develop
authorJustin Wind <justin.wind@gmail.com>
Mon, 15 Oct 2012 19:12:48 +0000 (12:12 -0700)
committerJustin Wind <justin.wind@gmail.com>
Mon, 15 Oct 2012 19:12:48 +0000 (12:12 -0700)

Trivial merge