From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Fri, 4 Aug 2006 14:31:10 +0000 (+0000)
Subject: merge of '1fabadea24c36f83b75bb8e13e7fe5bd38d9a6ce'
X-Git-Tag: Release-2010-05/1~9453^2~999^2~9^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39568f07d978a6d84d21dd29df689007216ad8fc;p=openembedded.git

Merge ... '1fabadea24c36f83b75bb8e13e7fe5bd38d9a6ce'
     and '56f4d34b013075bf28441d0800516ac2d470fc8b'
---

39568f07d978a6d84d21dd29df689007216ad8fc