merge of 4689c198b9377662259edcd5ff48375cfb709ee8
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 May 2006 10:07:06 +0000 (10:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 May 2006 10:07:06 +0000 (10:07 +0000)
     and 844655bde85aa0ff998861d8efaf849b632b4b66


Trivial merge