Merge remote-tracking branch 'upstream/master'
Added packages to NorNet slice image.
Merge branch 'master' of github.com:dreibh/planetlab-lxc-build