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

Merge ... '3d4a85aa2c2724b95dcfd705b2078392bd5fe7fa'
     and 'ed8e9ddaa8dd95860ce2c4ae76ec55966ab9f78c'
---

1b7c881ef1be32d17adf4eac8a92c30f0fc38145