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)
     and a349b2053c350eb4d9799057043eefd3946fad4c


Trivial merge