merge of 694969a93c9959459359c6fb14c40eb9a47b0d2f
authorRod Whitby <rod@whitby.id.au>
Sat, 14 Jan 2006 23:30:25 +0000 (23:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 23:30:25 +0000 (23:30 +0000)
     and 83739874587da7060ea036057cd64ecfc72a9727


Trivial merge