merge of 4aff7df6d6db91a152ee90e3cb907cd6f13bbba8
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jan 2006 14:12:55 +0000 (14:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 14:12:55 +0000 (14:12 +0000)
     and 55baaf0245d63854fcce5ac1b626215d06c99ce1


Trivial merge