From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 30 Mar 2006 15:52:16 +0000 (+0000)
Subject: merge of 028fac41fd6e3c12693a33f64dc1e331c0270149
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~36^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e9132b415e6d25a52bcd743936e2993562cbd08;p=openembedded.git

merge of 028fac41fd6e3c12693a33f64dc1e331c0270149
     and fb0a7d68e12187b6fa7e65a6685bd6a7244b9484
---

3e9132b415e6d25a52bcd743936e2993562cbd08