From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 May 2006 08:55:08 +0000 (+0000)
Subject: merge of 4af0b1bc6131703de0850a30751d772f9d2ae229
X-Git-Tag: Release-2010-05/1~9453^2~1644
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2b279135a4934b02da70e72037aeaf5af95478b;p=openembedded.git

merge of 4af0b1bc6131703de0850a30751d772f9d2ae229
     and cd46d30fbd05c83e7220c5e12d66f1620255ad00
---

b2b279135a4934b02da70e72037aeaf5af95478b