merge of 39729d6b68678d5bbb038fa919a3543cf944ae5a
authorGraeme Gregory <dp@xora.org.uk>
Wed, 28 Jun 2006 11:52:53 +0000 (11:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 11:52:53 +0000 (11:52 +0000)
     and 6952b3aa759f2634793539e314d873ae4a18dfbf


Trivial merge