am 05eca1d4: (-s ours) Merge change Ie80e2381 into eclair

Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-mr2

* commit '05eca1d46a45723a57899dabad698537b7faef82':
  DO NOT MERGE: Squashed commit of the following:
tree: 2044ceb42fee7a6c299b6c559bed0e48069bcd91
  1. cmds/
  2. include/
  3. media/