merge of 52b2cef3e9fdc9a6bb55fc7a1ed2afea0354680c
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 12:22:25 +0000 (12:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 12:22:25 +0000 (12:22 +0000)
     and 7ba73700ed732b698e688443c1f964454f76f1e8


Trivial merge