Merge change Iea6a38c6 into eclair-mr2

* changes:
  Squashed commit of the following:
tree: e13d666ee10eea352fd7d3d253e1f4d96984578e
  1. cmds/
  2. include/
  3. media/