merge of '0721559f76e0aaf9b2151c4ad47b5f5e77f92ea4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:22 +0000 (12:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:22 +0000 (12:13 +0000)
commitfda438de14bc0fc6f3b253ad41ef75e68218c641
treef4e77fd344d501b782ddd330874be4fd949a8465
parent329787ef9f6b2be615be3a93fec0e2916475445b
parent9d2b1056a5121ac78c64f51fbdc34f31ca6b092a
Merge ... '0721559f76e0aaf9b2151c4ad47b5f5e77f92ea4'
     and '4ca56810304293da744170c82e50552f5dcf084f'