From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 15 Jun 2006 10:10:41 +0000 (+0000)
Subject: merge of 8a0f4eccde91e3ba55d608b2f62e680de03ce7af
X-Git-Tag: Release-2010-05/1~9453^2~1459^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=672370e1a2e55c5614f9a21a4121bb2f22b1cc82;p=openembedded.git

merge of 8a0f4eccde91e3ba55d608b2f62e680de03ce7af
     and a7ead3e748143b22532c05b96cf77d578ce9f239
---

672370e1a2e55c5614f9a21a4121bb2f22b1cc82
diff --cc packages/linux/linux-openzaurus_2.6.16.bb
index e39f5a968e,dc187ad3b4..8ebccdf961
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@@ -1,6 -1,6 +1,6 @@@
  include linux-openzaurus.inc
  
--PR = "r35"
++PR = "r36"
  
  # Handy URLs
  # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \