From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 20 May 2006 11:53:06 +0000 (+0000)
Subject: merge of 28a5dee63c03c0d1372c9c00f5faaee2054fc87c
X-Git-Tag: Release-2010-05/1~9453^2~1665^2~5^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a46e18cceae6f0ead7d2d470bc78fb0f6478b0a;p=openembedded.git

merge of 28a5dee63c03c0d1372c9c00f5faaee2054fc87c
     and 91ec22075c5dc6f8ba0182e3781c2c79b37a8ba6
---

2a46e18cceae6f0ead7d2d470bc78fb0f6478b0a