From: Koen Kooi <koen@openembedded.org>
Date: Wed, 28 Jun 2006 09:02:47 +0000 (+0000)
Subject: merge of 96fed78607f0529e7177d55147568944ff559a90
X-Git-Tag: Release-2010-05/1~9453^2~1409^2^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea598444584f8fc9fff0ad6b482d761fcc0309c7;p=openembedded.git

merge of 96fed78607f0529e7177d55147568944ff559a90
     and c2ca1eca3e23b0468ffeab450e6a81d6ca829e45
---

ea598444584f8fc9fff0ad6b482d761fcc0309c7