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)
commit0c21d985cd31b9c3f14aed86c0632e160d5a3549
tree84ee3cdd290cea4a659bd4a36c967a0f346d536b
parent2b1e71a99eb85c82e4f5fbe16ad7d99ca250072a
parent734c5296cdfc25ec221233f49455e1280a64a595
merge of 39e43f0486c5d18bb8979c53687235b3f04855de
     and 738b5da14d9fd2be6600c5eb848647017fac3413