Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 15:47:50 +0000 (16:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 15:47:56 +0000 (16:47 +0100)
* qatar/master:
  arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge