From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 11 Jun 2006 15:33:31 +0000 (+0000)
Subject: merge of 862947fc7ef9b740fb666cce1351ba7df1cf9ca8
X-Git-Tag: Release-2010-05/1~9453^2~1463^2~1^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ffed0587ede52e317c6ba328555b9c8225d2ab4;p=openembedded.git

merge of 862947fc7ef9b740fb666cce1351ba7df1cf9ca8
     and e07cef00a7e452974d1c0ccfec2dea932a539ade
---

2ffed0587ede52e317c6ba328555b9c8225d2ab4