Merge proposals dependent on lp://staging/~tom-gall/linaro/live-helper.config.natty.linaro-multimedia-engineering

1. live-helper.config.natty.linaro-multimedia-engineering
2. Dependent merge proposals