From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 12 Apr 2006 17:37:06 +0000 (+0000)
Subject: merge of 24be272ea8c07c7b0b690d8be9589681925c037b
X-Git-Tag: Release-2010-05/1~9453^2~2055
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62729db753f544b7ab29a6b4af5005483a9a4cf;p=openembedded.git

merge of 24be272ea8c07c7b0b690d8be9589681925c037b
     and 4b742ad8af89b3c75d8c6bc198ef09f0509fe642
---

a62729db753f544b7ab29a6b4af5005483a9a4cf