merge of 0c6591535a11955c424cb90d7a157b640d408d35
authorRod Whitby <rod@whitby.id.au>
Fri, 11 Nov 2005 15:08:29 +0000 (15:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Nov 2005 15:08:29 +0000 (15:08 +0000)
     and 38425be5fd91cb4948ea49598a78227846a0b730


Trivial merge