merge of 1f08208ff3c43887e64b23c1f616b3c055f659f8
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jan 2006 22:43:19 +0000 (22:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 22:43:19 +0000 (22:43 +0000)
     and 5531936b9907566eaf1d648bfbcc4867ba699ccf


Trivial merge