merge of 2d917a9725f84078c390a35764f260c9abbef0f6
authorMichael Lauer <mickey@vanille-media.de>
Sun, 5 Mar 2006 16:22:01 +0000 (16:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Mar 2006 16:22:01 +0000 (16:22 +0000)
     and 4a411456169f13d81227a8f0f0087490f6b68814


Trivial merge