From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 19 Dec 2007 13:49:55 +0000 (+0000)
Subject: merge of '10d336f749155351a4d975d4ce5b31de4a24f911'
X-Git-Tag: Release-2010-05/1~8122^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a558575c3d71c90a1894e6babc871cac0fbdf096;p=openembedded.git

Merge ... '10d336f749155351a4d975d4ce5b31de4a24f911'
     and 'fa81c2e4895bf07fa663deaca7f47ed9b591f7e7'
---

a558575c3d71c90a1894e6babc871cac0fbdf096