Merge branch 'master' of ssh://git@moblin-mdi.jf.intel.com/umg-moorestown-libva