merge of 0733bfcfa824e0324d60f8ff76e749a1e93b5edd
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 23:20:43 +0000 (23:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 23:20:43 +0000 (23:20 +0000)
     and 270776af34e87c9cc517853ec60bf8d4f809496e


Trivial merge