Merge branch 'usr-merge' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

live-build/auto/config

@@ -1257,11 +1257,6 @@ esac
 case $SUBPROJECT in
 	buildd)
 		cp -af /usr/share/livecd-rootfs/live-build/buildd/* config/
-
-		# Disable merged /usr to avoid building packages with
-		# hardcoded paths that assume it.
-		echo 'DEBOOTSTRAP_OPTIONS="$DEBOOTSTRAP_OPTIONS --no-merged-usr"' \
-			>> config/common
 		;;
 esac