From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 1 May 2006 12:07:55 +0000 (+0000)
Subject: merge of 35ce256593987e71d7c04247837a04f2dfaea425
X-Git-Tag: Release-2010-05/1~9453^2~1787
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c6c1843d871ad454797fee6814360018e772a24;p=openembedded.git

merge of 35ce256593987e71d7c04247837a04f2dfaea425
     and c973ff55ff1f4aa31763966c5b65965b1da3e903
---

6c6c1843d871ad454797fee6814360018e772a24