Increment DISTRO_VERSION and DISTRO_NAME in master

With the edison branch stable, it's safe to increment DISTRO_VERSION and DISTRO_NAME

The following changes since commit 72928abdfc00af2a7a5fac27f82e23e5de8efc4b:

util-linux: Ensure perl scripts reference the correct perl (2011-09-28 21:51:52 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/distro_version
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/distro_version

Elizabeth Flanagan (1):
poky.conf: Increment DISTRO_VERSION

 meta-yocto/conf/distro/poky.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

From: Elizabeth Flanagan <[email protected]>

With 1.1 release coming, it's time to increment the DISTRO_VERSION and poky version.

---
 meta-yocto/conf/distro/poky.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 46b22f4..80d4e47 100644
@@ -1,6 +1,6 @@
 DISTRO = "poky"
-DISTRO_NAME = "Yocto (Built by Poky 5.0)"
-DISTRO_VERSION = "1.0+snapshot-${DATE}"
+DISTRO_NAME = "Yocto (Built by Poky 6.0)"
+DISTRO_VERSION = "1.1+snapshot-${DATE}"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 

1.7.1