modificato:   i386_iso-hybrid/config/package-lists/15-livedevelop.list.chroot
	modificato:   i386_iso-hybrid/config/package-lists/20-media.list.chroot
Merge branch 'master' of http://github.com/mortaromarcello/Livedevelop

Conflicts:
	i386_iso-hybrid/config/package-lists/20-media.list.chroot
	modificato:   amd64_iso-hybrid/config/package-lists/15-livedevelop.list.chroot
	modificato:   i386_iso-hybrid/config/package-lists/15-livedevelop.list.chroot
	modificato:   i386_iso-hybrid/config/package-lists/20-media.list.chroot