From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 14 Feb 2006 09:03:32 +0000 (+0000)
Subject: merge of 4dfda95c476d921e6eef34e4f4f52f0bc1131fbc
X-Git-Tag: Release-2010-05/1~9453^2~2365
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f157c00e55457a57fff84936003885fc06b0143;p=openembedded.git

merge of 4dfda95c476d921e6eef34e4f4f52f0bc1131fbc
     and c32c48613e0dc4ce1e969ae67a809fb9b9953787
---

1f157c00e55457a57fff84936003885fc06b0143