From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Apr 2006 13:09:00 +0000 (+0000)
Subject: merge of 59ae9726b5fbfe541edc28700acbc17ed11a9672
X-Git-Tag: Release-2010-05/1~9453^2~2045^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=511f610654ce94cd5d0030e1af17a37c7c4ccffb;p=openembedded.git

merge of 59ae9726b5fbfe541edc28700acbc17ed11a9672
     and d93900aa884b52d778b478749eeafadb6bef3a21
---

511f610654ce94cd5d0030e1af17a37c7c4ccffb