Merge "Add psnr/ssim tuning option"
authorJim Bankoski <jimbankoski@google.com>
Mon, 20 Dec 2010 17:32:13 +0000 (09:32 -0800)
committerCode Review <code-review@webmproject.org>
Mon, 20 Dec 2010 17:32:13 +0000 (09:32 -0800)

Trivial merge