merge of '5d7ba35bbc10b4418bedaa07910b69c32a41cb3c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:48:57 +0000 (14:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:48:57 +0000 (14:48 +0000)
commit841bb4846f4822238f10b5ae14d7545f7e4a288f
treeb72284918a35a6263d4ae0d7ae1dfe167e657680
parent3f24acef873cb1ab43b40fe7b2c5d6e065dd6dc5
parent817f413d3dae1c73f9ae31e532ef08687df1a63e
Merge ... '5d7ba35bbc10b4418bedaa07910b69c32a41cb3c'
     and '716a5d6fd8174fcd76d0f8767c7ee982f27832fa'