merge of ef08aba7157fe863f7b4edc112f782eca7adc632
authorMike Westerhof <mwester@dls.net>
Sat, 15 Apr 2006 18:11:06 +0000 (18:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Apr 2006 18:11:06 +0000 (18:11 +0000)
commitc186ea4254b4440e2a782ae41de89b2fc0e35cf4
treee22ab5e2f8483ddc93ca2ba6d149638015f771f5
parent26c6a60f1ada1015e5f6d98c8c83a1a2293e1821
parentf5193e9a40465133df954d44a1a0e0c0abc36ec7
merge of ef08aba7157fe863f7b4edc112f782eca7adc632
     and fbe3dd342a6d1c2693f57ab699c88225ca434a0f