merge of 7e6d5167b862ccf180c98f2c1b1373bdd8fdd65f
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 23:22:16 +0000 (23:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 23:22:16 +0000 (23:22 +0000)
     and f230ea166fd00577cf73bcb2cb81ab9767e16d4c


Trivial merge