Merge "gen_scalers: fix 64-bit integer promotion bug"
authorJohn Koleszar <jkoleszar@google.com>
Wed, 16 Jun 2010 18:54:10 +0000 (11:54 -0700)
committerCode Review <code-review@webmproject.org>
Wed, 16 Jun 2010 18:54:10 +0000 (11:54 -0700)

Trivial merge