merge of 608d58e1665f9ad5851aebd539e2ab73ff70fa54
authorRod Whitby <rod@whitby.id.au>
Fri, 28 Apr 2006 21:40:11 +0000 (21:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 21:40:11 +0000 (21:40 +0000)
     and 60ed4023d76ee23e593805e751d227e788d38682


Trivial merge