Merge branch 'release-1.1' into develop
authorJustin Wind <justin.wind@gmail.com>
Tue, 19 Feb 2013 06:35:08 +0000 (22:35 -0800)
committerJustin Wind <justin.wind@gmail.com>
Tue, 19 Feb 2013 06:35:08 +0000 (22:35 -0800)

Trivial merge