From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Dec 2006 14:39:25 +0000 (+0000)
Subject: merge of 1b9b5e29f993b107b17de5dde1395f8dba168e17
X-Git-Tag: Release-2010-05/1~9453^2~125^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56217c4daf17fc2c2868c422dec6dd75e0354403;p=openembedded.git

merge of 1b9b5e29f993b107b17de5dde1395f8dba168e17
     and 863cf8497d2f9d72834bcd0acfde2f78ee0ccb72
---

56217c4daf17fc2c2868c422dec6dd75e0354403