merge of af9c8fe6a8465294d0b061b7c05d14e6fb785a85
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Jul 2005 15:12:11 +0000 (15:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Jul 2005 15:12:11 +0000 (15:12 +0000)
     and b6cba454df414fce492cff133827ddcb40ed4c15


Trivial merge