merge of '19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jul 2007 12:22:46 +0000 (12:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jul 2007 12:22:46 +0000 (12:22 +0000)
commit55c7e51ffd293f98eeb9ae33e6173daaa040ccad
treeac6b42d649416bf10221e7b2b0564c3c00845a2b
parent6aa433ab8423974a6c2f3fa531a13c656eaeadec
parentc69d6ce868c881dcab0e520b824a7add0c157f16
Merge ... '19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511'
     and 'cec84fe6219f4a80315904254a401430604678dd'