Merge branch 'master' of git+ssh://AustinYuan@git.freedesktop.org/git/libva
authorAustin Yuan <shengquan.yuan@gmail.com>
Tue, 21 Dec 2010 10:47:17 +0000 (18:47 +0800)
committerAustin Yuan <shengquan.yuan@gmail.com>
Tue, 21 Dec 2010 10:47:17 +0000 (18:47 +0800)

Trivial merge