From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 25 Aug 2006 10:54:15 +0000 (+0000)
Subject: merge of 08b0e7058f8944b597207b5f969021dea13443c9
X-Git-Tag: Release-2010-05/1~9453^2~875^2~156
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eda0f252ca2dab0aff072e134bfa482a91066490;p=openembedded.git

merge of 08b0e7058f8944b597207b5f969021dea13443c9
     and d9256d2a6f06908a4b219e63c0e662263d139874
---

eda0f252ca2dab0aff072e134bfa482a91066490