[SCM] x264/master: Merge branch 'upstream'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.116.2042+git178455c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7db0bb69de8c00b9fab48b25a82af60bdbba5054
X-Git-Newrev: 528e0a6c93de1b481a9f4e327b2d5be007ad15eb

The following commit has been merged in the master branch:
commit 1934b85f24079387e3d7109a5479f968757e01bb
Merge: 524646923a83a171818bfdb69c3d78fb27c0e176 62387c11f3532d5753f000c41663446f02e3afd9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 9 20:44:23 2011 +0200

    Merge branch 'upstream'


-- 
x264 packaging