From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Mar 2007 10:13:08 +0000 (+0000)
Subject: merge of '1b7c658e3119f96127604c0bc4502889f9e1cd40'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~36^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fdb8e07ed4af21eccb6f4ca5cbc19c33f0b457c;p=openembedded.git

Merge ... '1b7c658e3119f96127604c0bc4502889f9e1cd40'
     and '39b23b4beb7895e8780a01657dbf05431b5a4918'
---

2fdb8e07ed4af21eccb6f4ca5cbc19c33f0b457c