merge of 'e0f576aebb5cfb2314d6b462c4903057ea1aceb3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:50:46 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 14:50:46 +0000 (14:50 +0000)
commitb7d0cb3eb00e1c630c61cc7e0e6872fe278556b3
treeb06e88704e80237cc2a947fcb4115a8d4544d423
parentac03da524e5e040ca320c59b2b03c75685d925e0
parent87e965902edfa597f6e99aa07eebc49a7e745bc8
Merge ... 'e0f576aebb5cfb2314d6b462c4903057ea1aceb3'
     and 'f0ec62cadbae3343a8a86690d39fcf38edf159d9'