merge of 5c10855cc5421d8c794fcf79f8086b6983ed1427
authorGraeme Gregory <dp@xora.org.uk>
Fri, 28 Apr 2006 11:03:35 +0000 (11:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 11:03:35 +0000 (11:03 +0000)
     and e70ccda5581f1f390d67506c04d6f28f415a67ce


Trivial merge