Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Tue, 31 Aug 2010 19:56:52 +0000 (15:56 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 31 Aug 2010 19:56:52 +0000 (15:56 -0400)
commitb7918d52403ac97ed524c306f02e8c030e26e98b
tree5e56a2d8ea44a60b06b3f508bef4463c5a41850a
parentf4020e2338a1786b1db0f67075ceb7d9c01be6a3
parent0b94f5d6e827c0b4d6b2590592be4285f60c8477
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
configure
configure
ivfenc.c
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
vpx/vp8cx.h