Merge branch 'master' of git+ssh://git.freedesktop.org/git/libva
authorAustin Yuan <shengquan.yuan@gmail.com>
Fri, 6 May 2011 04:52:44 +0000 (12:52 +0800)
committerAustin Yuan <shengquan.yuan@gmail.com>
Fri, 6 May 2011 04:52:44 +0000 (12:52 +0800)

Trivial merge