merge of 213055f44fbb065f13acbde0cf78285357fa5b17
authorKoen Kooi <koen@openembedded.org>
Sun, 21 May 2006 20:20:56 +0000 (20:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 20:20:56 +0000 (20:20 +0000)
     and 48bf49548c49f23c0829416516d9a654545ea89e


Trivial merge