merge of 11d6bd95a0db23f96eb6c52d8212e35447cb7a4c
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Dec 2005 18:31:43 +0000 (18:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 18:31:43 +0000 (18:31 +0000)
     and 4b8efd8ea23df73f8397284e81b3d7ba92173f77


Trivial merge