merge of '680351f441a2d128e922fe75529f1c41aa00994e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:35 +0000 (18:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:35 +0000 (18:12 +0000)
commitc2ec266706ad8abc8f0d44a22a95bcca2f99ce45
treefe6706667aef61e72e9cd36931271dc069754a84
parent369e7e57d3b993bafd8db26058c45406306928c7
parent327e3a7b60e6550f2fed6340996f5c72e87e2516
Merge ... '680351f441a2d128e922fe75529f1c41aa00994e'
     and '77b2a37e6b04513442adb1c4d27e5116cdb6fdc6'