From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 29 Apr 2006 15:31:04 +0000 (+0000)
Subject: merge of 7df389f1eac3887a08aa90c06c5abb20cd46ee79
X-Git-Tag: Release-2010-05/1~9453^2~1802^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=767fbaf85afcc771ff75ae4a3700b15b6618348b;p=openembedded.git

merge of 7df389f1eac3887a08aa90c06c5abb20cd46ee79
     and d73fbf99ff9ab2f08a1a7727c83b74f21bbd896d
---

767fbaf85afcc771ff75ae4a3700b15b6618348b