merge of 39e43f0486c5d18bb8979c53687235b3f04855de
authorMike Westerhof <mwester@dls.net>
Tue, 11 Apr 2006 03:19:51 +0000 (03:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 03:19:51 +0000 (03:19 +0000)
     and 738b5da14d9fd2be6600c5eb848647017fac3413


Trivial merge