merge master
authorJustin Wind <justin.wind@gmail.com>
Fri, 25 May 2012 03:12:17 +0000 (20:12 -0700)
committerJustin Wind <justin.wind@gmail.com>
Fri, 25 May 2012 03:12:43 +0000 (20:12 -0700)

Trivial merge