[SCM] vlc/master: Merge commit 'upstream/2.0.2'

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

Imported Upstream version 2.0.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: ed4611132f950677b82b28d1ab061f739ba7fc75
X-Git-Newrev: 4cc006a04e2832fa240f7ab99f5a0a6e513e6114

The following commit has been merged in the master branch:
commit 0861f206c0f45bfffad4b59aff669edf1f98e675
Merge: ed4611132f950677b82b28d1ab061f739ba7fc75 f8c92386cfdefb621be6f09078ed8523782eac43
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Fri Jun 29 11:36:10 2012 -0400

    Merge commit 'upstream/2.0.2'
    
    Upstream version 2.0.2


-- 
VLC media player packaging