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

Merge ... '36192872b2176688fcbc4233f22dc68b6987bd11'
     and '3efef7b4ec3372c8afd945bbe044ae2bc011cb38'
---

cdcc825f5cb18922289afe3a50d5be19a47d8d04