[SCM] x264/master: Merge tag 'upstream/0.120.2171+git01f7a33'

[ricotz-guest at users.alioth.debian.org]

Imported Upstream version 0.120.2171+git01f7a33
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3d9abae02369b2337df2ccd381558e9fe8383293
X-Git-Newrev: 2010b336e0e2fb1e02cedff0b94789c7a17c63da

The following commit has been merged in the master branch:
commit 7094ea5efeaaebe1c52f30c33ea512a36e89edfd
Merge: 3d9abae02369b2337df2ccd381558e9fe8383293 28a843d2b0c6e604abd2b888d28499879404363b
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Thu Mar 15 17:29:41 2012 +0100

    Merge tag 'upstream/0.120.2171+git01f7a33'
    
    Upstream version 0.120.2171+git01f7a33


-- 
x264 packaging