merge of 1fa7381f2503250b521218a5b5ee04a508cd6456
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Sep 2005 19:45:08 +0000 (19:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 Sep 2005 19:45:08 +0000 (19:45 +0000)
     and 7ff4c9eca8c99c6f15ec3a775fcd7f9113c528bb


Trivial merge