merge of 460c9c22eddb03009d980c3edb1ee42689b9e09d
authorMichael Lauer <mickey@vanille-media.de>
Wed, 10 May 2006 20:43:56 +0000 (20:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 20:43:56 +0000 (20:43 +0000)
commit3e5fb52e1267b68327c395b5cada0181ac356450
tree8d4274f150d79d63225dcef21163bd9444db2965
parent92ce84cc4a58d1df316bf37e1c0ca1e7eb0c196d
parent1ecc0bdb3fc73008e831dab6fd9d422e56afeeac
merge of 460c9c22eddb03009d980c3edb1ee42689b9e09d
     and a349b2053c350eb4d9799057043eefd3946fad4c