From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 21 Feb 2008 11:32:58 +0000 (+0000)
Subject: merge of '14adef1cb8437a9298373d856f25c230125dcdf6'
X-Git-Tag: Release-2010-05/1~7644^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4147dc6e41a5607ae426ce28733def14dc6f2b0;p=openembedded.git

Merge ... '14adef1cb8437a9298373d856f25c230125dcdf6'
     and '5fb8cfe19138b98226fe92044d302c9379dad84d'
---

c4147dc6e41a5607ae426ce28733def14dc6f2b0