From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 1 May 2007 10:22:08 +0000 (+0000)
Subject: merge of '21fe2445ed0bb510a34a0e01c77e30f0e6c021c3'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6fc151b534b56ecd560eb3cd2b4d5cc68cef4ff;p=openembedded.git

Merge ... '21fe2445ed0bb510a34a0e01c77e30f0e6c021c3'
     and '28d894c206a3bfee24708913d7b2a4fbdfca447e'
---

f6fc151b534b56ecd560eb3cd2b4d5cc68cef4ff