merge of 1b41c64722bde0b5c86d27069ca9d0c53a960054
authorGraeme Gregory <dp@xora.org.uk>
Mon, 22 Aug 2005 16:30:52 +0000 (16:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 16:30:52 +0000 (16:30 +0000)
     and f069e6b7848c9578f9c06566370555f579e193dd


Trivial merge