am dffa96f7: Merge change I90daccf3 into eclair

Merge commit 'dffa96f7349a44a5d587656fce5c55386d44b150' into eclair-mr2

* commit 'dffa96f7349a44a5d587656fce5c55386d44b150':
  fix [2143798] Need to figure out how to do video on Passion w/ GPU