merge of 47dce11edfa131d098408e653487b0f793394e95
authorRod Whitby <rod@whitby.id.au>
Sun, 8 Jan 2006 00:15:40 +0000 (00:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:15:40 +0000 (00:15 +0000)
     and 76db664e471ff075c7d6410d2cae0e1bdc9b1178


Trivial merge