From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 19 Nov 2007 15:44:45 +0000 (+0000)
Subject: merge of '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'
X-Git-Tag: Release-2010-05/1~8340^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=538e067ce8aae8035995ca85e611709db86c42c8;p=openembedded.git

Merge ... '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'
     and 'afc80db8fab3b6a16e23409594197e4000e28086'
---

538e067ce8aae8035995ca85e611709db86c42c8