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

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

Imported Upstream version 2.0.7
Imported Upstream version 2.0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports-sloppy
X-Git-Reftype: branch
X-Git-Oldrev: 35769794808b2873e5e5ac3be59809220dce8082
X-Git-Newrev: 412c8d0aa715eb114d4e0c43c4262caa0ac6c3aa

The following commit has been merged in the squeeze-backports-sloppy branch:
commit 91b6c0916a2b719397fba9ea472a0ee56241253c
Merge: 74d5c9c37083240150f1ea76e7a79775adade8ff 087169e0a4134188ed6c4055bd76910e4ab51ef9
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Sun Jun 9 13:10:52 2013 -0400

    Merge commit 'upstream/2.0.7' into squeeze-backports-sloppy
    
    Conflicts:
    	Makefile.in
    	aclocal.m4
    	config.h.in
    	configure
    	doc/Makefile.in
    	lib/Makefile.in
    	src/Makefile.in


-- 
VLC media player packaging