merge of 191c15587a52167bdbf3962df6cf1720cec9be13
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 10 Oct 2005 12:59:25 +0000 (12:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Oct 2005 12:59:25 +0000 (12:59 +0000)
     and 6f6f4ddb44c518f6657a701445cadd26d5c7439e


Trivial merge