merge of 45908085bdceb2276493e588d8d89daba46b6d5c
authorRod Whitby <rod@whitby.id.au>
Mon, 22 May 2006 01:48:53 +0000 (01:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 May 2006 01:48:53 +0000 (01:48 +0000)
     and ec1cfabe499e84bf5627a49cc40bae42b557c638


Trivial merge