merge of '2ea9f4ae40e1a9b07744e81b924d464d9e450aba'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Nov 2007 10:50:47 +0000 (10:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Nov 2007 10:50:47 +0000 (10:50 +0000)
commitcd218bdd24c1df03d7dfe3b8b6c939b5fb4af640
tree2de0377be5e023085f13c11e87d9ca223dc542b4
parent9b34dcde2a80218d107711d403fcfb5d8a1d62f7
parent37dd0368bfdbb8b3680b8158d6e4d7bef646ad7f
Merge ... '2ea9f4ae40e1a9b07744e81b924d464d9e450aba'
     and 'be33ed116b217c668a13a0dae151271036541f73'