merge of 184a2f969c1aae565fcc6649d5bc16c3f6b2e7b3
authorGraeme Gregory <dp@xora.org.uk>
Fri, 5 May 2006 08:54:32 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 08:54:32 +0000 (08:54 +0000)
     and fd64cee80d213fd5efaa0473b981ec7e226f3907


Trivial merge