merge of 66c62d7fb075e5d0b30f7334eb98a0c3515f163c
authorKoen Kooi <koen@openembedded.org>
Thu, 11 May 2006 17:23:36 +0000 (17:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 17:23:36 +0000 (17:23 +0000)
     and 76e73da6705bd6599f3cb10085809f45b528bc8e


Trivial merge