merge of 'c0b4eb64db45d24b111a58d9ffb1b180e4d17137'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 12:11:24 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 12:11:24 +0000 (12:11 +0000)
commit3146f9a9ef2aca8f059952328781d4b7b5c37c0f
treef03a3d830fd88905d3a644902b754a19b6b04183
parent701fdcfc97940ff9b7f1d47ebbbcfce1887610ae
parent07c11f6a309479b6b1e7e448862eedc7a3c42b82
Merge ... 'c0b4eb64db45d24b111a58d9ffb1b180e4d17137'
     and 'd05a568510f934fffcdc39418db998497a694eae'