Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
diff --git a/yocto-poky/.templateconf b/yocto-poky/.templateconf
new file mode 100644
index 0000000..0650a46
--- /dev/null
+++ b/yocto-poky/.templateconf
@@ -0,0 +1,2 @@
+# Template settings
+TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}