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

Merge ... '5213367b0a50df561f29c1075ae072d630b19966'
     and 'ad4e848a7b84675e9075f4e9dfd733e81992a9d5'
---

c2decd3cc2126b77d7194e2fe6fa5f0f97df14f1