From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 29 May 2007 01:23:50 +0000 (+0000)
Subject: merge of '5e7d92a4f32f02a84db8e661648ed70184fe038d'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2^2~1^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c062c8b28aa53e884375475a003e7bcdd3ba0bc1;p=openembedded.git

Merge ... '5e7d92a4f32f02a84db8e661648ed70184fe038d'
     and '6ff9b399b6c7eab81fecfb284a0763acbc4a4ee3'
---

c062c8b28aa53e884375475a003e7bcdd3ba0bc1