ref: 7a590c902b9a77d9792d3a2497d28302eb0e0834
parent: f4020e2338a1786b1db0f67075ceb7d9c01be6a3
parent: 5551ef0ef4fd3271330fa5a2fbdfe70d4d2a1d2e
author: John Koleszar <jkoleszar@google.com>
date: Fri Nov 5 08:30:33 EDT 2010
Merge remote branch 'origin/master' into experimental Conflicts: configure ivfenc.c vp8/common/alloccommon.c vp8/common/onyxc_int.h vp8/vp8_cx_iface.c