Merge "Remove duplicate and unused functions"
authorYaowu Xu <yaowu@google.com>
Mon, 7 Jun 2010 14:42:22 +0000 (07:42 -0700)
committerCode Review <code-review@webmproject.org>
Mon, 7 Jun 2010 14:42:22 +0000 (07:42 -0700)

Trivial merge