Small fix in error message.
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'rowcache'