From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 10 Jul 2007 21:39:51 +0000 (+0000)
Subject: merge of '330fb172df78da5ccf19876c4fa2be87783aea08'
X-Git-Tag: Release-2010-05/1~8868^2~176^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5162313734c25d73e114c540f3ad811523fedaac;p=openembedded.git

Merge ... '330fb172df78da5ccf19876c4fa2be87783aea08'
     and '340ff84700df308d945fb6efde89fbb319ff1a84'
---

5162313734c25d73e114c540f3ad811523fedaac