merge of 7da66fdac38a59d4284a8123c0234669c472a79d
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Apr 2006 21:40:08 +0000 (21:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 21:40:08 +0000 (21:40 +0000)
     and 80f57797ca269f48cd6cff1da033d972ac4f1d02


Trivial merge