From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 23 Oct 2007 11:50:53 +0000 (+0000)
Subject: merge of '9719a8ead20aff09d9b8f2d80aff72670abba7c1'
X-Git-Tag: Release-2010-05/1~8454^2~165^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0696b9ebb23cdcdaa4ab5562c7d91a6da48d7b6;p=openembedded.git

Merge ... '9719a8ead20aff09d9b8f2d80aff72670abba7c1'
     and 'a15433a82ceaa76923d681389ae649e7489220a8'
---

d0696b9ebb23cdcdaa4ab5562c7d91a6da48d7b6