merge of 5bd9649f2ec60851738e4ceea6409f7ea11daa85
authorGraeme Gregory <dp@xora.org.uk>
Wed, 18 Jan 2006 09:47:05 +0000 (09:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 09:47:05 +0000 (09:47 +0000)
     and b4a513218154eb17b59ed896ac7e0037ab11fc14


Trivial merge