merge of 0301ca2b29fe2554d791cb230b33104946f9d50b
authorRod Whitby <rod@whitby.id.au>
Sat, 22 Oct 2005 18:38:51 +0000 (18:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Oct 2005 18:38:51 +0000 (18:38 +0000)
     and 435eda25fcea43b6f5ea1c355dee46e99dcecf85


Trivial merge