[SCM] x264/master: Merge tag 'upstream/0.129.2230+git1cffe9f'

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

Imported Upstream version 0.129.2230+git1cffe9f
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ceab497a30560db9db7bf6ded594400f76a2686a
X-Git-Newrev: f2d5b3e996c522cdc1b0992ab6b9f1bde8185140

The following commit has been merged in the master branch:
commit 215b48b8e107e2b88cacbf766b74e2c212f3607c
Merge: 5568dd22f981242a2fbe735854762061826b84af 7888783004e85c401c1c97f109359ff198957512
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sun Jan 6 12:27:22 2013 +0100

    Merge tag 'upstream/0.129.2230+git1cffe9f'
    
    Upstream version 0.129.2230+git1cffe9f


-- 
x264 packaging