merge of c8607c1fd6f2272b8b57d41db45cc4ee916f9fed
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Nov 2005 16:03:24 +0000 (16:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Nov 2005 16:03:24 +0000 (16:03 +0000)
     and f7da4369dc264ba4cc88a416a2763402bf92d133


Trivial merge