Bug 1060278 second attempt

This branch has a cleaner git history.
The commit https://github.com/mozfreddyb/gaia/commit/5c37b3c095dff9d834989d950af1f5ce9f3c9b20 shows cleanly which IDs have been added with newly coined content.