merge of 3fed9104364d068f612d6a2a77c80f26f26f3544
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 07:52:34 +0000 (07:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 07:52:34 +0000 (07:52 +0000)
     and e0d458573e9c93b608fcceacd5ed347e607b4c2d


Trivial merge