merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
authorRod Whitby <rod@whitby.id.au>
Thu, 29 Jun 2006 19:46:48 +0000 (19:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 19:46:48 +0000 (19:46 +0000)
     and 6ccfcb3e298f740c7e45b8312a95877c3f842f6d


Trivial merge