Merge "Fixing divide by zero"
authorJohn Koleszar <jkoleszar@google.com>
Fri, 4 Mar 2011 13:40:33 +0000 (05:40 -0800)
committerCode Review <code-review@webmproject.org>
Fri, 4 Mar 2011 13:40:33 +0000 (05:40 -0800)

Trivial merge