Merge branch 'master' of git+ssh://AustinYuan@git.freedesktop.org/git/libva 96/496/1 ww48.2-video ww48.3-video ww48.4-video ww49.1-video
authorAustin Yuan <shengquan.yuan@intel.com>
Mon, 23 Nov 2009 08:21:41 +0000 (16:21 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Mon, 23 Nov 2009 08:21:41 +0000 (16:21 +0800)

Trivial merge