merge of 2d0c6c5ae9de1c7f719379b1be47dc565de60d41
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Nov 2005 21:08:54 +0000 (21:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Nov 2005 21:08:54 +0000 (21:08 +0000)
     and 81893f6385397851b77ac4dab982e8f0ae5a9198


Trivial merge