From: Mike Westerhof <mwester@dls.net>
Date: Sat, 15 Apr 2006 18:11:06 +0000 (+0000)
Subject: merge of ef08aba7157fe863f7b4edc112f782eca7adc632
X-Git-Tag: Release-2010-05/1~9453^2~1907^2~121
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c186ea4254b4440e2a782ae41de89b2fc0e35cf4;p=openembedded.git

merge of ef08aba7157fe863f7b4edc112f782eca7adc632
     and fbe3dd342a6d1c2693f57ab699c88225ca434a0f
---

c186ea4254b4440e2a782ae41de89b2fc0e35cf4