merge of 113e53533fd379355156720bc34edd95b0322f33
authorGraeme Gregory <dp@xora.org.uk>
Fri, 22 Jul 2005 15:10:08 +0000 (15:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 15:10:08 +0000 (15:10 +0000)
     and c4b803554ad0cca18de36fcb52185ce50dafc3b9


Trivial merge