merge of '3ba01558b82d1bb3bf15860e3d01719651ff13c6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 00:59:38 +0000 (00:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 00:59:38 +0000 (00:59 +0000)
commit72554e0157dd579db4b1166cfadfd00200f5325c
treea6895fd3de78c81871a9ec1320c2d53bb1268cd8
parent2a46e35f47253a8f6f7e1c16356fed58c9c3214e
parent04a36610bd004a7d1d40e12539515c88fca47e6a
Merge ... '3ba01558b82d1bb3bf15860e3d01719651ff13c6'
     and '89809f216db3df7abbf2f0427e5fe3291e0b150e'