[SCM] x264/master: Merge commit 'upstream/0.118.2085+git8a62835'

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

Imported Upstream version 0.118.2085+git8a62835
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 44193162152244054f35f7ebe7530f0e6b75b3f8
X-Git-Newrev: e5c7cc8ddbb2fa799afb1c24cd26d5f4313f6494

The following commit has been merged in the master branch:
commit e5c7cc8ddbb2fa799afb1c24cd26d5f4313f6494
Merge: 44193162152244054f35f7ebe7530f0e6b75b3f8 04b018ee3eb07503db0456d667455d30c801896b
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Thu Oct 13 10:13:18 2011 +0200

    Merge commit 'upstream/0.118.2085+git8a62835'


-- 
x264 packaging