From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Jun 2007 10:24:19 +0000 (+0000)
Subject: merge of 'bfb00d07f52c7b9131c72ba2ccf74615ff161cac'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4cca286a441f6b3ee710d7e40ec8d95d01b5449;p=openembedded.git

Merge ... 'bfb00d07f52c7b9131c72ba2ccf74615ff161cac'
     and 'fe92fd648b90fb22867f8ea1c1db92ba9e42b7c0'
---

f4cca286a441f6b3ee710d7e40ec8d95d01b5449