merge of 55616adc37fd37aa5b75ff09493523a3f11eb2e9
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Apr 2006 15:31:24 +0000 (15:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 15:31:24 +0000 (15:31 +0000)
     and a9dcf266b1c5bcea869b5f63ef5e8b7a2739b0f2


Trivial merge