[SCM] vlc/squeeze-backports: Merge commit 'upstream/2.0.5' into squeeze-backports

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

Imported Upstream version 2.0.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports
X-Git-Reftype: branch
X-Git-Oldrev: 55e330d49324a31bec1da805a4b32e529a90732e
X-Git-Newrev: cfa5fbe52dafedc1dd6db49a9ec3d61ac775edd2

The following commit has been merged in the squeeze-backports branch:
commit 5365b2e80132176ef623936ef4e268131a93f22d
Merge: 55e330d49324a31bec1da805a4b32e529a90732e 8b47b6d911394e05ea29253d9dfc19217d245df3
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Sun Feb 17 22:05:13 2013 -0500

    Merge commit 'upstream/2.0.5' into squeeze-backports
    
    Conflicts:
    	Makefile.in
    	configure


-- 
VLC media player packaging