[SCM] x264/master: Merge commit 'upstream/0.120.2127+gitf33c8cb'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.120.2127+gitf33c8cb
Imported Upstream version 0.119.2113+gitcc129ad
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c67ea65fa835fab83f64a77683d32a91dbd6ac2d
X-Git-Newrev: 38ca6b0c34a9af8f72b0ef1b21883cc834c98bb7

The following commit has been merged in the master branch:
commit b9a7ea19b25365e3304ed4060e07fcbc199d6659
Merge: 3cd62e366cdf281d60a46f0ed761d147eed4c8fd f39fadc81b88c599f4f050b9d56607b5fd084621
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 16 16:57:06 2012 +0100

    Merge commit 'upstream/0.120.2127+gitf33c8cb'


-- 
x264 packaging