merge of '5a77ab41b3385a039d9e0696c7d69b01aad3ad92'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:34:50 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:34:50 +0000 (19:34 +0000)
commit67a821524c05794cee8c26d3d2c7236ce8bc2f8e
treec8a33ef84f1c2db617b3c6ef378da032b9555652
parent97b021ece5247b0a0956b63ad8830f20d67eaab2
parent00fa38c08d45c3a921a6276e7ce85f5259695310
Merge ... '5a77ab41b3385a039d9e0696c7d69b01aad3ad92'
     and 'a40851440ffc312af9c5719717490a99603b8d29'