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)
commitc249c2d80d47fe2b9b0567da92d7d4ca14065ede
treede2ffbb38f53ff0ee93288a32cca19f3008795e7
parentc09ac5ea27870470980a426e9a9733f19d7dafd0
parentf33495f71c1f61ce1d9c07f9ffb70be58d6735b0
merge of c0f2020be5e1a629681b41eef34c49dc0341f03b
     and c202b2641db39b482c615f965d40d02caa42c5c5