merge of '3ee7753352acbc0627f1b877b1ba96587f656224'

     and 'bc0b144ff867cb1e66b24d5ba91c183ee6d51cb6'

116 files changed, 2630 insertions, 911 deletions

diff --git a/classes/image.bbclass b/classes/image.bbclass
index ca9c9458e1..d70cfa5daf 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -90,6 +90,7 @@ fakeroot do_rootfs () {
 	${IMAGE_PREPROCESS_COMMAND}
 		
 	export TOPDIR=${TOPDIR}
+	export DISTRO=${USERDISTRO}
 	export MACHINE=${MACHINE}
 
 	for type in ${IMAGE_FSTYPES}; do
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index ac2d281123..27a04a028c 100644
--- a/conf/bitbake.conf
+++ b/