From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 24 Dec 2007 01:10:16 +0000 (+0000)
Subject: merge of '74c545ed021de12395e8e037da79100e4b8f5a18'
X-Git-Tag: Release-2010-05/1~8113^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=516565b4587daaf2852a2e19a182cb17b78d3b7a;p=openembedded.git

Merge ... '74c545ed021de12395e8e037da79100e4b8f5a18'
     and 'a70eb4537d92437b2af4fb50a7250a04e5814ee4'
---

516565b4587daaf2852a2e19a182cb17b78d3b7a