merge of 185405646e0484ff489d7bc195a40be8bfe36861
authorRod Whitby <rod@whitby.id.au>
Thu, 18 Aug 2005 04:14:37 +0000 (04:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Aug 2005 04:14:37 +0000 (04:14 +0000)
     and 220fba21be479c672bf9c87ec9e8d18ced2b3443


Trivial merge