Merge branch 'master' into gst-vaapi-branch
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 5 Jul 2013 17:02:12 +0000 (19:02 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 5 Jul 2013 17:02:12 +0000 (19:02 +0200)
commit5b90f9d79f752149f9db13cf5b872a413d67d6de
tree7feb686d9acd38bba4b1e339af6df0aec284e438
parent0e44e0902fe9cc4e97fb926e823e44902ccbf79f
parenta2c653f958bbd464b0c97becf97be77f1ba47595
Merge branch 'master' into gst-vaapi-branch