From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 11 Nov 2006 18:22:30 +0000 (+0000)
Subject: merge of a83b40dbdf522cf477298e73d789074887799468
X-Git-Tag: Release-2010-05/1~9453^2~481^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eb54f079356de0e82ff98cfc68a3ab254b38351;p=openembedded.git

merge of a83b40dbdf522cf477298e73d789074887799468
     and e2fde1c5cf87c2b0a9be2dfac2a1a1937db68382
---

4eb54f079356de0e82ff98cfc68a3ab254b38351