[SCM] x264/master: Merge commit 'upstream/0.120.2151+gita3f4407'

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

Imported Upstream version 0.120.2151+gita3f4407
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a3104743d0a07c99fb037bf8f60404718673d9bf
X-Git-Newrev: 082912ff2ad3559fc5d005cba7502e3e1050feea

The following commit has been merged in the master branch:
commit 4952b5804551bbfeca0b51db39a714faf68a636f
Merge: 8662b0bba0de720d82183cbccaca947b190ecf8c 8a0e4dbc4387e90e629718bf0bd2a7229a9ec676
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sun Feb 5 10:23:46 2012 +0100

    Merge commit 'upstream/0.120.2151+gita3f4407'


-- 
x264 packaging