[SCM] x264/master: Merge tag 'upstream/0.125.2209+git68dfb7b'

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

Imported Upstream version 0.125.2209+git68dfb7b
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b567a7903bcb6cfb044de74c4e8fd3af36f5dd57
X-Git-Newrev: 9ff99a6cdee9ee665599b4c782c9c946a0512ece

The following commit has been merged in the master branch:
commit 9311bfb17e24fea2906f59df4c251a2b1a9c5da7
Merge: d9a1070fce4ab2b7ab56bc17cf884f983b6c7354 de9b2bb810031d7bd8e5408c1227738c8769bfe1
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Wed Sep 19 09:54:02 2012 +0200

    Merge tag 'upstream/0.125.2209+git68dfb7b'
    
    Upstream version 0.125.2209+git68dfb7b


-- 
x264 packaging