Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org...

Conflicts:
	recipes/tgt/tgt_1.0.5.bb

diff --cc recipes/iscsi-target/iscsi-target_1.4.20.1.bb
index 0f98de7,ed61bce..bcf86f9
--- 1/recipes/iscsi-target/iscsi-target_1.4.20.1.bb
--- 2/recipes/iscsi-target/iscsi-target_1.4.19.bb
+++ b/recipes/iscsi-target/iscsi-target_1.4.20.1.bb
@@@ -1,14 -1,17 +1,14 @@@
  DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
  HOMEPAGE = "http://iscsitarget.sourceforge.net/"
  LICENSE = "GPL"
- PR = "r0"
+ PR = "r1"
  
 -SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz;name=iscsitarget1419targz \
 -
 -           file://libs.patch \
 -           file://2.6.31.patch \
 -           file://2.6.32.patch \
 +SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \
             file://ietd.conf \
             file://init"
 -SRC_URI[iscsitarget1419targz.md5sum] = "9beca214c28949cce1716b49fec57de4"
 -SRC_URI[iscsitarget1419targz.sha256sum] = "a9fc5e43a2806b8aa95513b2af06d97bb9181ef5fedc906d69144d93a86e664a"
 +
 +SRC_URI[md5sum] = "6e5e641b832d420e030d5efb59eca7ce"
 +SRC_URI[sha256sum] = "994186389911d41a0d2a65b7001ff060f778e2c77f80bd98e03776b215e0732c"
  S = "${WORKDIR}/iscsitarget-${PV}"
  
  

diff --cc recipes/tgt/tgt_1.0.5.bb
index 7baee86,1b01cec..5c120f6
--- 1/recipes/tgt/tgt_1.0.5.bb
--- 2/recipes/tgt/tgt_1.0.3.bb
+++ b/recipes/tgt/tgt_1.0.5.bb
@@@ -4,10 -4,10 +4,17 @@@ LICENSE = "GPLv2
  DEPENDS = "openssl"
  RDEPENDS_${PN} = "iscsi-target"
  
++<<<<<<< HEAD:recipes/tgt/tgt_1.0.5.bb
 +PR = "r0"
 +SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz"
 +SRC_URI[md5sum] = "200fb1b4e8d42b072de2bac238c7d779"
 +SRC_URI[sha256sum] = "b8cc9fdbacdcd9717b6c4bc15f7999a5bd4a20a334a09b47a3ae5ea21383eb1a"
++=======
+ PR = "r1"
+ SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz;name=tgttargz"
+ SRC_URI[tgttargz.md5sum] = "5a7c6b2c585c5f969c64e2c19f49f439"
+ SRC_URI[tgttargz.sha256sum] = "018f772370fe3dae815e09416e5dae5ae464335a1efe6343cf80612a29fe54e4"
++>>>>>>> 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee:recipes/tgt/tgt_1.0.3.bb
  
  
  EXTRA_OEMAKE += "ISCSI=1"