[SCM] libva/master: Merge commit 'upstream/1.0.4'

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

Imported Upstream version 1.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6af056e13319e2ad96eafd2918b6c80a87d2d971
X-Git-Newrev: b6e0ae4917199713609dd9c8709c265ee6817d46

The following commit has been merged in the master branch:
commit 29a1db3629fe59beee23f8b28c7f59ef89adcf65
Merge: 20bdcdf8a08c386c2ccf06687478474a1fa3b8cc 9c2b63387ce608ff4f9446170aca8c5d5f3aea84
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Sep 10 13:16:47 2010 -0400

    Merge commit 'upstream/1.0.4'


-- 
libva packaging