From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 10 Aug 2007 13:18:31 +0000 (+0000)
Subject: merge of '05d7857e561d553fa8a2cb0f4804ddb7ad439b27'
X-Git-Tag: Release-2010-05/1~9054
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f07b378887fe386d5bea51c81ace10fe634683b6;p=openembedded.git

Merge ... '05d7857e561d553fa8a2cb0f4804ddb7ad439b27'
     and '3a92f90a4b9cae5ae633ec1058381c9527912c9a'
---

f07b378887fe386d5bea51c81ace10fe634683b6