From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 17 Mar 2007 20:10:07 +0000 (+0000)
Subject: merge of '159e0203ae3c554f80e3e2a3e60c667d512714af'
X-Git-Tag: Release-2010-05/1~8868^2~1034^2~10^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b907c2b74332c2805d1c2d3b848dd0fa45d54c5f;p=openembedded.git

Merge ... '159e0203ae3c554f80e3e2a3e60c667d512714af'
     and '5b6c7e1ca56b6b00f76eabbab125b6a4bd439c24'
---

b907c2b74332c2805d1c2d3b848dd0fa45d54c5f