merge of ef08aba7157fe863f7b4edc112f782eca7adc632
authorMike Westerhof <mwester@dls.net>
Sat, 15 Apr 2006 18:11:06 +0000 (18:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Apr 2006 18:11:06 +0000 (18:11 +0000)
     and fbe3dd342a6d1c2693f57ab699c88225ca434a0f


Trivial merge