merge of 06d21bcf828a008844c92e310530a3d845183621
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 May 2006 09:27:44 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 09:27:44 +0000 (09:27 +0000)
     and efe6276728025a594e625fdef00f7703a0dd4229


Trivial merge