merge of '12e21bd2f481aca9252bc00eb529548b1b0187fd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 04:28:12 +0000 (04:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 04:28:12 +0000 (04:28 +0000)
commite6d7427d4c3ecfe015a838903602bccc19b7d76b
tree3cefaf203ddce2a995e1fd30d7493f082a7ac4e7
parent2f8521c6d1173dd650d9ae2bba8c18e690fa3b1f
parent32414dbf90932f59d745eabd64a113d941afaa35
Merge ... '12e21bd2f481aca9252bc00eb529548b1b0187fd'
     and '5057b0d0a8cd261e84871fecfebfa818b91794ae'