merge of b9ca9fd7f2a8108ba2e4ccd8ad4e71464cfa782e
authorMike Westerhof <mwester@dls.net>
Tue, 18 Apr 2006 04:07:11 +0000 (04:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Apr 2006 04:07:11 +0000 (04:07 +0000)
     and ee282fd56ede355c1afbe06deea556672508236c


Trivial merge