merge of 65ff3c29b2d11109da1f8a71bdfcc1dfe9819b3d
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 19:46:44 +0000 (19:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 19:46:44 +0000 (19:46 +0000)
     and 9e50203982dff971247712f595aa258181bfff0f


Trivial merge