[SCM] x264/master: Merge commit 'upstream/0.118.2092+git6eac7c3'

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

Imported Upstream version 0.118.2092+git6eac7c3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 73373a69360a857825c36f4255a120bb5d8cadf6
X-Git-Newrev: ce6691bb3dcb80af2edd038ab5cd96bf4fcd0c79

The following commit has been merged in the master branch:
commit 6e74594cc11299bb7b7ca2685ac2995e2502e8b8
Merge: b2e5d6a43fae00e9cd9466b89733e24a8d0955b6 472f39c76b7a3a68a680d214c7517d9c6e5a5a30
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sat Oct 22 23:19:59 2011 +0200

    Merge commit 'upstream/0.118.2092+git6eac7c3'


-- 
x264 packaging