merge of f0d5a9cad37301a7b5305db122880b04aa6a20b7
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Apr 2006 22:44:46 +0000 (22:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 22:44:46 +0000 (22:44 +0000)
     and fd10e7e7e2425da1310503d4f79c27673a6294f0


Trivial merge