From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 11 Jun 2006 08:58:17 +0000 (+0000)
Subject: merge of 0bda2d2be880e8f2511362475ca94c7fccbe18db
X-Git-Tag: Release-2010-05/1~9453^2~1463^2~1^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e741e9d602b4c17a83d5f46358f041b076f19360;p=openembedded.git

merge of 0bda2d2be880e8f2511362475ca94c7fccbe18db
     and 21e0b3e6f31b3802c08eabc0c9c109ae745596a0
---

e741e9d602b4c17a83d5f46358f041b076f19360