merge of 0a90fa3f8e7b85f79fe8930a1969aff12f3553b8
authorKoen Kooi <koen@openembedded.org>
Mon, 13 Feb 2006 22:06:00 +0000 (22:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 13 Feb 2006 22:06:00 +0000 (22:06 +0000)
     and f207b08f6d852f81f78ab6a6c3ed4502fc88f898


Trivial merge