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

merge of 2a0956d3d788fd6caf098eb56a5f161a02ad649a
     and e8030c72619f16a558a9178a85e85af348b8129b
---

db8433c25bb0f52c5c8a1b271f3df6c1ba6598ac