[SCM] x264/master: Merge tag 'upstream/0.124.2198+git1c97f35'

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

Imported Upstream version 0.124.2198+git1c97f35
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2664542ac8d16702c67cfa800d58c1b29cf64d75
X-Git-Newrev: b36668660b2b76480ae6c601bdb2533ae5aa2786

The following commit has been merged in the master branch:
commit 6cdaece51a1c1e8121fef60e0c81045cd3b3fc35
Merge: 72f05cbb05c0bc3c09ba7c093928e42acc4467f4 e09bd4355f87e533d104e341c7e6fb8af37f2b10
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Fri May 25 07:32:57 2012 +0200

    Merge tag 'upstream/0.124.2198+git1c97f35'
    
    Upstream version 0.124.2198+git1c97f35


-- 
x264 packaging