From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 16 May 2006 21:55:39 +0000 (+0000)
Subject: merge of 81c701fb4af8296026067c0e6d6a33431d87cd78
X-Git-Tag: Release-2010-05/1~9453^2~1692^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2328ac8bc6a44b9a0e57ad503a57fabb80facac1;p=openembedded.git

merge of 81c701fb4af8296026067c0e6d6a33431d87cd78
     and 9e3733eb68c0fe66fdaa1fea2a1c364deec68678
---

2328ac8bc6a44b9a0e57ad503a57fabb80facac1