From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 5 Jul 2006 10:51:38 +0000 (+0000)
Subject: merge of b910f2201c5aba208eedfb5ec07c0d6a245ef6ae
X-Git-Tag: Release-2010-05/1~9453^2~1339^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56378718c05875d2544a4b4e59d29945364b0475;p=openembedded.git

merge of b910f2201c5aba208eedfb5ec07c0d6a245ef6ae
     and cc177b76c6de45f8a6dc0ceca028319d4e6126d2
---

56378718c05875d2544a4b4e59d29945364b0475