merge of 4370ca2e204ad443d596f20685d97fe2caf98d16
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Jun 2006 09:33:21 +0000 (09:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Jun 2006 09:33:21 +0000 (09:33 +0000)
     and be41d3c873f735d9ffdf407fd302ced522ee9e36


Trivial merge