[SCM] xvidcore/master: Merge commit 'upstream/1.3.2'

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

Imported Upstream version 1.3.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4e7f83494f07cc05e282d439fa98248cd75f7878
X-Git-Newrev: ff8294d2b7aca8a80ac25baa98c31ec2f084d7df

The following commit has been merged in the master branch:
commit f326297b196db048ea7f1bd6ad594df700096111
Merge: 4e7f83494f07cc05e282d439fa98248cd75f7878 09b81b1d58c65ab8c8bf250a0e018831d6c464fc
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 1 02:01:35 2011 +0200

    Merge commit 'upstream/1.3.2'


-- 
xvidcore packaging