From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 19 May 2006 21:50:39 +0000 (+0000)
Subject: merge of 8b069f0b5e4fc820af1c8f803a12366dbb47a104
X-Git-Tag: Release-2010-05/1~9453^2~1672
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=306d832e65d41aa3dd5966ed9eaf7aa60ff77e39;p=openembedded.git

merge of 8b069f0b5e4fc820af1c8f803a12366dbb47a104
     and 9a476ca14bf1cfb6a29b0a506daf400991c515e4
---

306d832e65d41aa3dd5966ed9eaf7aa60ff77e39