merge of da9de24c6bfa7b08b9abc3a124f370c7d0d7a037
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jul 2005 11:53:02 +0000 (11:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 11:53:02 +0000 (11:53 +0000)
     and edacf91eca9c3e62395f0b114f99e0798cda45b6


Trivial merge