From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 11 Dec 2006 14:58:36 +0000 (+0000)
Subject: merge of '7168bc90d12251e04fc9d38ea7a8082b002fff93'
X-Git-Tag: Release-2010-05/1~9453^2~173
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e59be84f1e7dc42189f2cf51dbf92f5658ae9b9d;p=openembedded.git

Merge ... '7168bc90d12251e04fc9d38ea7a8082b002fff93'
     and 'e97ced3dc091a93df4e70b2feabd08d3d70bafbc'
---

e59be84f1e7dc42189f2cf51dbf92f5658ae9b9d