merge of 09627713f8e42fa38928ab18579f8b439551a6a6
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 30 Jul 2005 14:22:50 +0000 (14:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 14:22:50 +0000 (14:22 +0000)
     and 1281bf8b46b175630b1cf44e40c66e27a43a71cc


Trivial merge