From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 24 Apr 2006 11:59:06 +0000 (+0000)
Subject: merge of 784fefbad71c3505470368a578f10f698b47068d
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8976d52059d279621083343652ef2c23cae23da2;p=openembedded.git

merge of 784fefbad71c3505470368a578f10f698b47068d
     and d28fb7268cf69c4ca2450e6581fb928a7027f78e
---

8976d52059d279621083343652ef2c23cae23da2