From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 28 Jun 2006 11:52:53 +0000 (+0000)
Subject: merge of 39729d6b68678d5bbb038fa919a3543cf944ae5a
X-Git-Tag: Release-2010-05/1~9453^2~1409^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9943bed1ee00a137de0b3ae9d30abe4a63ce5d82;p=openembedded.git

merge of 39729d6b68678d5bbb038fa919a3543cf944ae5a
     and 6952b3aa759f2634793539e314d873ae4a18dfbf
---

9943bed1ee00a137de0b3ae9d30abe4a63ce5d82