From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 3 Apr 2006 13:46:02 +0000 (+0000)
Subject: merge of 006ae295fb5a2b06d28233cf442ed2de2d7cdd36
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afc9ef5bd0b28712292f80d5aa0130b35f76159f;p=openembedded.git

merge of 006ae295fb5a2b06d28233cf442ed2de2d7cdd36
     and dc0a41efce7dadc6c656636252f8b9125bb97517
---

afc9ef5bd0b28712292f80d5aa0130b35f76159f