merge of 796b997254855ff420d682f8dc76e72efcae336f
authorRod Whitby <rod@whitby.id.au>
Sat, 3 Sep 2005 14:07:04 +0000 (14:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 Sep 2005 14:07:04 +0000 (14:07 +0000)
     and ec654721498c715927f9b99127a77f4843f52adc


Trivial merge