merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

diff --cc packages/gloox/.mtn2git_empty
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391,0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 100644,000000..100644
--- 1/.mtn2git_empty
--- /dev/null
+++ b/packages/gloox/.mtn2git_empty

diff --cc packages/gloox/gloox_0.8.1.bb
index 09004a81825eb3b61effd474b0671fa92b6b7c2f,0000000000000000000000000000000000000000..09004a81825eb3b61effd474b0671fa92b6b7c2f
mode 100644,000000..100644
--- 1/packages/gpephone/gloox_0.8.1.bb
--- /dev/null
+++ b/packages/gloox/gloox_0.8.1.bb

diff --cc packages/iksemel/.mtn2git_empty
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391,0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 100644,000000..100644
--- 1/.mtn2git_empty
--- /dev/null
+++ b/packages/iksemel/.mtn2git_empty

diff --cc packages/iksemel/iksemel_1.2.bb
index 40ad32ce0e836250a14cf9d4685404ae490035cb,0000000000000000000000000000000000000000..903d8f046d8bda07d56402345d8fc7fe103c1cbb
mode 100644,000000..100644
--- 1/packages/gpephone/iksemel_1.2.bb
--- /dev/null
+++ b/packages/iksemel/iksemel_1.2.bb
@@@ -1,14 -1,0 +1,14 @@@
- DEPENDS     = "glibc"
 +LICENSE     = "LGPL"
 +DESCRIPTION = "A simple, powerful XML-parsing library written in C."
 +SECTION = "libs"
 +PRIORITY    = "optional"
++DEPENDS     = "glibc gnutls"
 +PR          = "r0"
 +
 +inherit pkgconfig autotools
 +
 +SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
 +
 +do_stage () {
 +      autotools_stage_all
 +}

diff --cc packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 7c49fdd77b09d5afd1878102ca4f260084db4299,5f36686636927cb4c8bc1db78d270b629d7bb211..5e69e8768861ad93a8629fb8ab54e9965b1bb138
--- 1/packages/opie-sh-snes/opie-sh-snes_cvs.bb
--- 2/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@@ -1,5 -1,4 +1,5 @@@
  require ${PN}.inc
  
 -PV = "${OPIE_CVS_PV}"
 +#Remove the dash below when 1.2.1 changes
 +PV = "1.2.2+cvs-${SRCDATE}"
- 
+ PR = "r1"