merge of 3e349431fd26f1c3eb3f6a3425f8c8d44167a5cb
authorRod Whitby <rod@whitby.id.au>
Sat, 21 Jan 2006 10:00:10 +0000 (10:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 10:00:10 +0000 (10:00 +0000)
     and c1cd7b6a9ca9efdbea812fd0574ecb2bcdc1f8e4


Trivial merge