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

[siretart at users.alioth.debian.org]

Imported Upstream version 1.0.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 82bc6188563bbfbee75f57d2d04739a8482d77ff
X-Git-Newrev: e4415aeb41d1def82a28c8a0af4430b50bbddf13

The following commit has been merged in the master branch:
commit 877a826c2223706693bb9944f71427a0969efa77
Merge: 82bc6188563bbfbee75f57d2d04739a8482d77ff 9c0ddd6331adbad2feacdeb7076a6f70808fe0b3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 4 06:12:58 2011 +0100

    Merge commit 'upstream/1.0.15'
    
    Conflicts:
    	debian.upstream/libva-dev.dirs
    	debian.upstream/libva1.dirs
    	debian/changelog
    	debian/control
    	debian/libva-dev.install
    	debian/libva1.install
    	debian/rules


-- 
libva packaging