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

Conflicts:
	recipes/linux/linux-kirkwood_2.6.33-rc1.bb

diff --cc recipes/linux/linux-kirkwood_2.6.33-rc1.bb
index 1c1f340,3b85619..c138351
--- 1/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
--- 2/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
+++ b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb
@@@ -14,16 -14,13 +14,16 @@@ SRCREV = "58c19e3ea75a629c3d38a4490f96a
  SRC_URI = "git://repo.or.cz/linux-2.6/linux-2.6-openrd.git;protocol=git \
             file://defconfig"
  
 -SRC_URI_append_openrd-base += " \
 -      file://openrd-base/openrd-base-enable-pcie.patch;patch=1"
 +SRC_URI_append_openrd-base += \
 +      "file"//openrd-base/openrd-base-enable-pcie.patch;patch=1 \
 +       file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \
 +      "
  
- SRC_URI_append_openrd-client += \
-       "file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \
+ SRC_URI_append_openrd-client += " \
+        file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \
         file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;patch=1 \
         file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;patch=1 \
 +       file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \
        "
  
  # update machine types list for ARM architecture, only for machines that need it

diff --cc recipes/mythtv/mythplugins_0.22.bb
index b121fdf,b121fdf..c53b448
--- 1/recipes/mythtv/mythplugins_0.22.bb
--- 2/recipes/mythtv/mythplugins_0.22.bb
+++ b/recipes/mythtv/mythplugins_0.22.bb
@@@ -11,18 -11,18 +11,20 @@@ DEPENDS_mythweb_lighttpd = "mythweb
  RDEPENDS_mythweb_lighttpd = "lighttpd lighttpd-module-cgi lighttpd-module-fastcgi \
          lighttpd-module-rewrite php-cgi lighttpd-module-auth"
  
++PR = "svnr${SRCPV}+r0"
  PV = "0.22"
--PR = "r1"
  
--QMAKE_PROFILES = "mythplugins.pro"
--
--SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2 \
++SRCREV = "23062"
++SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtvplugins;proto=http \
          file://sysroot.patch;patch=1 \
          file://mythplugins_wo_qtopengl.diff;patch=1 \
          file://configure.patch;patch=1 \
          file://mytharchive.pro.patch;patch=1 \
          "
  
++
++QMAKE_PROFILES = "mythplugins.pro"
++
  S = "${WORKDIR}/mythplugins-0.22"
  
  inherit qmake2 qt4x11

diff --cc recipes/mythtv/myththemes_0.22.bb
index 6f22a27,6f22a27..4e7a64d
--- 1/recipes/mythtv/myththemes_0.22.bb
--- 2/recipes/mythtv/myththemes_0.22.bb
+++ b/recipes/mythtv/myththemes_0.22.bb
@@@ -1,12 -1,12 +1,14 @@@
  DEPENDS = "mythtv"
  inherit qmake2
  
++PR = "svnr${SRCPV}+r0"
  PV = "0.22"
--PR = "r0"
  
--FILES_${PN} =+ "${datadir}"
++SRCREV = "23062"
++SRC_URI =
++"svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtvthemes;proto=http"
  
--SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2"
++FILES_${PN} =+ "${datadir}"
  
  S = "${WORKDIR}/myththemes-0.22"