merge of 'ca8372038767a35e63d1e9dbba1a00401241ff28'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Jan 2007 09:57:07 +0000 (09:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Jan 2007 09:57:07 +0000 (09:57 +0000)
commit11f03716ee585ce7ffff95f6214701f618ef03e6
treed26f5eb887334f689d5dff2e45a1ac7886f5cd62
parent0f7aeee64915f4befa798d26508aa18ae293c01b
parent6acce0eb39f2f7cf47dc01282151a8e9fe7ddb05
Merge ... 'ca8372038767a35e63d1e9dbba1a00401241ff28'
     and 'd382786b6a8c504afd4a305cff2554679c82c72a'