From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 14 May 2007 09:00:13 +0000 (+0000)
Subject: merge of '36e9da9da2dc49de8451fcb307377018bf615857'
X-Git-Tag: Release-2010-05/1~8868^2~517
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96066ddc50d3a99cb5d3f605711121c9ed8949ce;p=openembedded.git

Merge ... '36e9da9da2dc49de8451fcb307377018bf615857'
     and 'f40c77903a237b25c7cf6371f1eb2a56629ec0c4'
---

96066ddc50d3a99cb5d3f605711121c9ed8949ce