merge of 009ad2ebd87d84a529fa64970aef3233b7733d5e
authorRod Whitby <rod@whitby.id.au>
Thu, 28 Jul 2005 08:03:42 +0000 (08:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 08:03:42 +0000 (08:03 +0000)
     and 0850de9cd5fce13fe0304a29f025705350f8ab6e


Trivial merge