From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 9 May 2007 05:44:30 +0000 (+0000)
Subject: merge of '8cf0ade6025c07f6fb2d8dcb863a8e6b345dddaa'
X-Git-Tag: Release-2010-05/1~8868^2~517^2~2^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb1bf22bf1f99bf39062a414dc95b783af24e0eb;p=openembedded.git

Merge ... '8cf0ade6025c07f6fb2d8dcb863a8e6b345dddaa'
     and 'e7a885c65fac678637bdc0153d73dafaa9bb1608'
---

fb1bf22bf1f99bf39062a414dc95b783af24e0eb