From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 11 May 2006 17:05:53 +0000 (+0000)
Subject: merge of 6efbfec71e63ee2a821512e58cb523b4ead883d6
X-Git-Tag: Release-2010-05/1~9453^2~1717^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42e19276711783047e5e75bacca2dae5dc2f3fd;p=openembedded.git

merge of 6efbfec71e63ee2a821512e58cb523b4ead883d6
     and c243286c01b3794a7ec43b97e5e8786b2d269083
---

e42e19276711783047e5e75bacca2dae5dc2f3fd