Merge remote-tracking branch 'esr/master'
authorW. Trevor King <wking@tremily.us>
Fri, 2 Aug 2013 17:51:52 +0000 (10:51 -0700)
committerW. Trevor King <wking@tremily.us>
Fri, 2 Aug 2013 17:51:52 +0000 (10:51 -0700)
* esr/master:
  Typo fix.


Trivial merge