merge of 5a8084e08b69c9be4be7facebd4b8b54f2517284
authorRod Whitby <rod@whitby.id.au>
Tue, 4 Apr 2006 20:35:19 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 20:35:19 +0000 (20:35 +0000)
     and 8155b665cd045405d46ba694ceca0de714a7b535


Trivial merge