From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 1 Jun 2006 19:50:50 +0000 (+0000)
Subject: merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
X-Git-Tag: Release-2010-05/1~9453^2~1511^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef9bef657fcdac524257084fb63059331109502d;p=openembedded.git

merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
     and 1d06e6b15d2905a1cad4fc0f31a004a369b66d1c
---

ef9bef657fcdac524257084fb63059331109502d