merge of 1506d12fe8ff1d8436934663e78fc3c298406bd2
authorMichael Lauer <mickey@vanille-media.de>
Mon, 27 Mar 2006 16:52:36 +0000 (16:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Mar 2006 16:52:36 +0000 (16:52 +0000)
     and 8809b1f1d7adf1812d6bf8155574eb4721370006


Trivial merge