From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 6 Feb 2007 10:54:20 +0000 (+0000)
Subject: merge of '531b56411734b2c857cc1bcb737fcccef9833ab1'
X-Git-Tag: Release-2010-05/1~9273
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f382b01ff8e36a8b92a23b6e934ebefe65eb721a;p=openembedded.git

Merge ... '531b56411734b2c857cc1bcb737fcccef9833ab1'
     and '5c2c70f1ecf63e84f8c487423e9c7d65a4f05d8e'
---

f382b01ff8e36a8b92a23b6e934ebefe65eb721a