merge of b503225bb0570ffa6a6474a82c5619d84e7b924c
authorKoen Kooi <koen@openembedded.org>
Mon, 24 Apr 2006 12:56:44 +0000 (12:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 12:56:44 +0000 (12:56 +0000)
     and c58814f376d35d00a79a9d8e79fe477dd12257c7


Trivial merge