From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 19 Feb 2008 11:42:29 +0000 (+0000)
Subject: merge of '30d98b4425ef003cbb8d55331331b30fb4e01742'
X-Git-Tag: Release-2010-05/1~7653^2~10^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7592cf0d864ce7c2c2ba2ed7b3140c4549497677;p=openembedded.git

Merge ... '30d98b4425ef003cbb8d55331331b30fb4e01742'
     and '69dabfbe1413fb2b5406fa5303f924d26af15b02'
---

7592cf0d864ce7c2c2ba2ed7b3140c4549497677