merge of 01d13ac2c361ef4b10719889dea72fd4630df482
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Apr 2006 18:50:34 +0000 (18:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 18:50:34 +0000 (18:50 +0000)
     and 551667095e22fd8245f03b1ae7d45c0c5a3ec1c3


Trivial merge