merge of 40dd65ee679ec60cc190d4c6be30ff366e22f0db
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jan 2006 14:17:33 +0000 (14:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 14:17:33 +0000 (14:17 +0000)
     and 8430d0607315085d8609a176b022ef4857edf05f


Trivial merge