merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
authorGraeme Gregory <dp@xora.org.uk>
Wed, 7 Sep 2005 16:28:18 +0000 (16:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 16:28:18 +0000 (16:28 +0000)
     and e60f9bf4e3714006cd19bf86bc76e3009a7bfff3


Trivial merge