From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 10 Apr 2006 13:40:38 +0000 (+0000)
Subject: merge of 36cb9cba2fd4c56a699cbd4285642c1a6f1fa710
X-Git-Tag: Release-2010-05/1~9453^2~2080
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23570f7c70ef5d8f523a6e3a43ebe339c6307fc8;p=openembedded.git

merge of 36cb9cba2fd4c56a699cbd4285642c1a6f1fa710
     and 6412fbc6b6ef09f97014f02c61ab03c743c2e265
---

23570f7c70ef5d8f523a6e3a43ebe339c6307fc8