merge of 718895e358e441c13f030839cde1f2afd9525837
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Apr 2006 20:46:00 +0000 (20:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 20:46:00 +0000 (20:46 +0000)
     and ac0211db57ef3b498cdc5cc32344b9c2073b87d4


Trivial merge