Merge change I8d2de438 into eclair

* changes:
      fix [2143798] Need to figure out how to do video