merge of 68dc68630ef5f8cb5f392a2b722b9e4df487594d
authorMichael Lauer <mickey@vanille-media.de>
Mon, 2 Jan 2006 16:14:05 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jan 2006 16:14:05 +0000 (16:14 +0000)
commit23f06f8a938e6bbf21fd33688ca9fb1744d14315
tree88f45095b66474d4155c940c36b6d0a377fd7925
parentc9081894576c7441974af11e30e5ed7d948298f7
parent3784ba68be3eb0b6920a76402bf2e1df7d031bae
merge of 68dc68630ef5f8cb5f392a2b722b9e4df487594d
     and e3e867b6681848568f2694833afb3a3a08b8fa48