Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 5 Nov 2010 01:50:37 +0000 (21:50 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 5 Nov 2010 01:50:37 +0000 (21:50 -0400)
commit362f763cfe56d06ab667bf042a0614af32da711f
treea2e968c4fb1afc3a70143ddc39b2ded5652242ea
parent68041990735f3d731d41e94eb1142bd257cd5cf8
parent507eb4b57722f680993dda45db1eec985b4b3df6
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
vpxenc.c
configure
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
vpxenc.c