merge of 020407be67cb5ae7c9c858d86887a93ec7831f78
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:36:02 +0000 (00:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:36:02 +0000 (00:36 +0000)
     and 76db664e471ff075c7d6410d2cae0e1bdc9b1178


Trivial merge