merge of '30b1decf31b37e6643b28149e04182c911b9a226'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 22:48:56 +0000 (22:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 22:48:56 +0000 (22:48 +0000)
commit7265791dadcd90742e6a37a2cbb22cdc98e70971
tree72d5c88613d304a77e95af14a691d1fd48d19c0f
parent4d244fcd518a4aa0ec00fe75555e07dcd5be8f47
parent3c6833c197fc55c12ab3d374a27a48cac03f74bd
Merge ... '30b1decf31b37e6643b28149e04182c911b9a226'
     and 'eb1c40b4c0c0e45af72840032d1f8ffdf59afecc'