From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Fri, 9 Jun 2006 13:20:35 +0000 (+0000)
Subject: merge of 482d0ac7ec1cff34c9fc7affc4b051abafb85e03
X-Git-Tag: Release-2010-05/1~9453^2~1479
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7f3725d8ab361dd85077638ba965481a80ba526;p=openembedded.git

merge of 482d0ac7ec1cff34c9fc7affc4b051abafb85e03
     and df1198a3d060cad27956be1a6653a6556adfe9dd
---

c7f3725d8ab361dd85077638ba965481a80ba526