[SCM] x264/master: Merge tag 'upstream/0.123.2189+git35cf912'

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

Imported Upstream version 0.123.2189+git35cf912
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 868f61d48c0900c7746e912f2e27d411e7cdffa5
X-Git-Newrev: 3f9312b1ef7cf5ba9a982cd8b2fef9afa8fbd8bb

The following commit has been merged in the master branch:
commit f90e60c5925c51e92556076c0578b975b14c108c
Merge: 124489240572e55d3a611c5121d2d2ec1064e9e8 40a14aa02817507751a92c677ef261e196858ec7
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sun Apr 29 19:53:31 2012 +0200

    Merge tag 'upstream/0.123.2189+git35cf912'
    
    Upstream version 0.123.2189+git35cf912


-- 
x264 packaging