Merge "fix the mix use of errorperbit and sadperbit"
authorYaowu Xu <yaowu@google.com>
Thu, 26 May 2011 16:39:41 +0000 (09:39 -0700)
committerCode Review <code-review@webmproject.org>
Thu, 26 May 2011 16:39:41 +0000 (09:39 -0700)

Trivial merge