merge of 1b2e21b185da17a194d778853f848c2e86a2d31a
authorGraeme Gregory <dp@xora.org.uk>
Mon, 12 Jun 2006 12:32:44 +0000 (12:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 12:32:44 +0000 (12:32 +0000)
     and 649d3cf23ceed3a98c61de4cfc356bb3848b9cf3


Trivial merge