From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 31 May 2007 05:03:22 +0000 (+0000)
Subject: merge of '3a83490f3912de8140c15cfc3041c16cc3cb74f9'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=161ec533445c09738ac409e1d5f4fd67a2cbaf56;p=openembedded.git

Merge ... '3a83490f3912de8140c15cfc3041c16cc3cb74f9'
     and '822e28d638d8fcb371cdeaf75ee55e6d53e2ef90'
---

161ec533445c09738ac409e1d5f4fd67a2cbaf56