[SCM] libva/master: Merge branch 'upstream'

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

Imported Upstream version 1.0.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 976fc29381d93b00440ef3d65255a80ef2353662
X-Git-Newrev: 7a6a902a845b7499b3f36964818f9ca0d2e19f37

The following commit has been merged in the master branch:
commit c3b29d6643ac4ccae655dd394c82ae799522d855
Merge: 9b7a168ffee3d75257ef64bc1c5a6e16bcf8e82c 14c3a8730d899e540a5889c9566f97fea169274d
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 30 11:28:49 2011 -0500

    Merge branch 'upstream'
    
    Conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/libva-dev.install
    	debian/libva1.install
    	debian/rules


-- 
libva packaging