merge of 8bfbc13386e9803228f6e1221669b7cb6a379c18
authorRod Whitby <rod@whitby.id.au>
Sun, 30 Oct 2005 00:16:40 +0000 (00:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Oct 2005 00:16:40 +0000 (00:16 +0000)
     and ee91eab40e16fd26e3a706434e40d97953ccc457


Trivial merge