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

Merge ... '1e54d761b418c28fcee92e7b7c45f55fe41676a3'
     and 'f9d679b49c9ccfedc3565929011b677de9852036'
---

edb488ab04dd2d3fad6cd65ab682ad9c6741e9de