[SCM] x264/master: Merge commit 'upstream/0.115.1943+git6e33b51'

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

Imported Upstream version 0.115.1943+git6e33b51
Imported Upstream version 0.106.1741
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2d203dea9af8ec9c067a6f92feb131b0b62358ac
X-Git-Newrev: 700c5cfbffcbdf7b204506fb28eec40656911d09

The following commit has been merged in the master branch:
commit 19926e50093e510ba8d02867e146148e8cdda977
Merge: 9efe689dcdebcf4b210b924160e9710ca77423fb 56dbe893df41d4ddb7654b1e09f41f6e9974b5dc
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 4 17:51:30 2011 -0400

    Merge commit 'upstream/0.115.1943+git6e33b51'
    
    Conflicts:
    	.gitignore


-- 
x264 packaging