Merge branch 'master' of git+ssh://git.freedesktop.org/git/libva 04/804/1
authorAustin Yuan <shengquan.yuan@gmail.com>
Fri, 10 Jun 2011 05:42:56 +0000 (13:42 +0800)
committerAustin Yuan <shengquan.yuan@gmail.com>
Fri, 10 Jun 2011 05:42:56 +0000 (13:42 +0800)

Trivial merge