From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 10 May 2006 18:36:41 +0000 (+0000)
Subject: merge of 383f54bb340ef9be1fdf7241b922566502b40e1e
X-Git-Tag: Release-2010-05/1~9453^2~1730^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f4b85e7578cda25dd41a01eb5717dab5e9301a8;p=openembedded.git

merge of 383f54bb340ef9be1fdf7241b922566502b40e1e
     and a3dbfe01cde42b68cf450e18651fe60be57fe1bb
---

1f4b85e7578cda25dd41a01eb5717dab5e9301a8