Merge "Restore and deprecate img_fmt"
authorJames Zern <jzern@google.com>
Mon, 24 May 2010 17:47:38 +0000 (10:47 -0700)
committerCode Review <code-review@webmproject.org>
Mon, 24 May 2010 17:47:38 +0000 (10:47 -0700)

Trivial merge