Merge branch 'release/1.3' master
authorJustin Wind <justin.wind@gmail.com>
Tue, 26 Feb 2013 22:25:54 +0000 (14:25 -0800)
committerJustin Wind <justin.wind@gmail.com>
Tue, 26 Feb 2013 22:25:54 +0000 (14:25 -0800)
Minor cleanups.


Trivial merge