merge of d7d2b282dadda7b779a80c0f37b124c7ac66f441
authorGraeme Gregory <dp@xora.org.uk>
Fri, 7 Jul 2006 09:42:39 +0000 (09:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Jul 2006 09:42:39 +0000 (09:42 +0000)
     and f69048cb1da290493a5bd429ce6a81de777410d2


Trivial merge