merge of 73a458a7f5d306cf25469186c7ca277895c5e2b2
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Apr 2006 20:34:35 +0000 (20:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 20:34:35 +0000 (20:34 +0000)
     and b45333304fdefa7fde471e8d3b251f8557ffb146


Trivial merge