merge of 4a7d921e80850f7a639e03de72acc36c6badae3a
authorRod Whitby <rod@whitby.id.au>
Wed, 20 Jul 2005 21:53:39 +0000 (21:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 21:53:39 +0000 (21:53 +0000)
     and e29528cd2e6cd7c36e18b6318938ec5cbb2c01db


Trivial merge