Merge "Fix one gcc compiler warning"
authorYunqing Wang <yunqingwang@google.com>
Thu, 14 Oct 2010 19:20:25 +0000 (12:20 -0700)
committerCode Review <code-review@webmproject.org>
Thu, 14 Oct 2010 19:20:25 +0000 (12:20 -0700)

Trivial merge