merge of '043369f4d3f199290929731a9ad8b9be49e12a98'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 16:36:07 +0000 (16:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 16:36:07 +0000 (16:36 +0000)
commit18559ea518666195ad07e7fbca3303e9f02424fc
treeb76d81831503b4d4036ce727d4f58e0f08e518a1
parentfa8a13f39e612e23159f136983e18938ae92d360
parent8abb2a0626641b7be5037d76e63e7ddadca87517
Merge ... '043369f4d3f199290929731a9ad8b9be49e12a98'
     and 'bc21e707c3e812b35e2e6b7365ded989cae46f31'