merge of '013a96e567ac3d22f9121aaae719886752b7ca5c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Feb 2008 22:54:43 +0000 (22:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Feb 2008 22:54:43 +0000 (22:54 +0000)
commit86ab4ca668cb971754725bae68f9a325c07229e0
tree63efa20b1ba3df259f2467b39a04023b06fc44eb
parentc7466a04f7f9a0c62d410ec548756816c6b6cea7
parentb091ff237321c4569a7ae6650eb35051f40ecd98
Merge ... '013a96e567ac3d22f9121aaae719886752b7ca5c'
     and '5b8c5c497076a23e627bf798389a7e60c4d13a8c'