From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 12 Aug 2005 13:59:08 +0000 (+0000)
Subject: merge of 41ccdaa6ccec1fc3dd5467a321a4920945f4a673
X-Git-Tag: Release-2010-05/1~9453^2~3901^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbfb5b4608244162d40320f09352b2694a1c2cfe;p=openembedded.git

merge of 41ccdaa6ccec1fc3dd5467a321a4920945f4a673
     and f79035e45efd4ec295a4f073b25a42193a9cda7b
---

fbfb5b4608244162d40320f09352b2694a1c2cfe