From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 18 Oct 2005 08:59:53 +0000 (+0000)
Subject: merge of 751202dec5e87f8d2890ebfa4eda6fc01be383dd
X-Git-Tag: Release-2010-05/1~9453^2~3245
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38626a82631ddb7b1c69b2f5a324b4f94156707b;p=openembedded.git

merge of 751202dec5e87f8d2890ebfa4eda6fc01be383dd
     and 7aa0e0efab18c8baf78ca2412e3d5602bf2252fc
---

38626a82631ddb7b1c69b2f5a324b4f94156707b