Merge branch 'release/release-1.2' into develop
authorJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:38:28 +0000 (18:38 -0800)
committerJustin Wind <justin.wind@gmail.com>
Fri, 22 Feb 2013 02:38:28 +0000 (18:38 -0800)

Trivial merge