merge of 0bcaa551d84ba78a6e2e40137eb0e4ff36d0b68e
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 22 Aug 2005 15:05:58 +0000 (15:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 15:05:58 +0000 (15:05 +0000)
     and 3c029d760d1bb441a3632db0b6ea12f2d8a5ad37


Trivial merge