ref: fd294c553aa63d8047e5c8e20c37bac9b2185e15
parent: 0ccefd2c8f82d4aacc0b8410788caaa36c5602eb
parent: c647ec4462640ae2aff569ac4bb46aa702581596
author: Yunqing Wang <yunqingwang@google.com>
date: Mon Dec 19 03:42:20 EST 2011
Merge "Merge mr_pick_inter_mode and pick_inter_mode"