merge of 5184d5d01f81fcaa198426dc405ef4635ac0099e
authorRod Whitby <rod@whitby.id.au>
Sun, 4 Dec 2005 17:31:02 +0000 (17:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Dec 2005 17:31:02 +0000 (17:31 +0000)
     and 75401918dca3876106733c357fd6be43748c9bab


Trivial merge