merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
authorKoen Kooi <koen@openembedded.org>
Sat, 11 Mar 2006 18:51:17 +0000 (18:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Mar 2006 18:51:17 +0000 (18:51 +0000)
     and 97dd2ea8547ce10b119dbe5649f9504851b72a0a


Trivial merge