merge of 55cbddab59b09643a3b63cc4ee2b0e3868e00881
authorKoen Kooi <koen@openembedded.org>
Wed, 3 May 2006 18:35:37 +0000 (18:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 18:35:37 +0000 (18:35 +0000)
     and 84f88bab5876bb87db120d773bcb36301a59313f


Trivial merge