merge of bb8a3b34208ff63b05eb2b6f77183737b9a38c6a
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Dec 2005 16:10:21 +0000 (16:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Dec 2005 16:10:21 +0000 (16:10 +0000)
     and efe5ba84574e7ae7e86f7fb34cf883a21c2144bb


Trivial merge