merge of 'd3fa7065b141a0eadc8b300509ed7e4508ac1f95'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 1 Jun 2007 13:52:40 +0000 (13:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 1 Jun 2007 13:52:40 +0000 (13:52 +0000)
commit0f5aadcc235f4679b774a246adb425196b712fad
treeeab5f9c1354dca3ac0bf42aaeb98608c7afff109
parentc26c4c8a89c47afeb6624e3b33e491d918f4da52
parentd3914e7ca7b22dcaf3c4fdaed74582163d6477d3
Merge ... 'd3fa7065b141a0eadc8b300509ed7e4508ac1f95'
     and 'eaf3a51c8eeda81e029db9d3d3dbf0d4fd16dfb8'