[SCM] x264/master: Merge commit 'upstream/0.116.2037+gitf8ebd4a'

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

Imported Upstream version 0.116.2037+gitf8ebd4a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 51cf8df1b7bad72e472d59bba7cb15f8507000d5
X-Git-Newrev: 2cee59de3e514c971585a894853159b69c834361

The following commit has been merged in the master branch:
commit 9044efe1221920ec5452b9f687f6e56ea9a6ad21
Merge: a4abdd332b9d6668b78cbef14ebc83121d103cec cfd8492bcb5ef5d09877e72097c09c6b7287b002
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 25 17:37:00 2011 -0400

    Merge commit 'upstream/0.116.2037+gitf8ebd4a'


-- 
x264 packaging