merge of c0f2020be5e1a629681b41eef34c49dc0341f03b
authorMike Westerhof <mwester@dls.net>
Mon, 24 Apr 2006 21:57:00 +0000 (21:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 21:57:00 +0000 (21:57 +0000)
     and c202b2641db39b482c615f965d40d02caa42c5c5


Trivial merge