merge of 61aa408f3a01fffc55bb2aa59c4801f8c68ec695
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Apr 2006 11:56:25 +0000 (11:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 11:56:25 +0000 (11:56 +0000)
     and bf6be0792ee7f592df6a7940fb7b0bf86f833157


Trivial merge