merge of 707842fefbf8720b051cb97cb37552d6ef57ff7c
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Jul 2005 13:49:55 +0000 (13:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Jul 2005 13:49:55 +0000 (13:49 +0000)
     and 9c45030223d178a64672f3307679b78e36e95ef9


Trivial merge