From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 16 Jan 2006 14:12:55 +0000 (+0000)
Subject: merge of 4aff7df6d6db91a152ee90e3cb907cd6f13bbba8
X-Git-Tag: Release-2010-05/1~9455^2~2641^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a23611f8a6c27539253019a8ab581e7fc6ccfd4;p=openembedded.git

merge of 4aff7df6d6db91a152ee90e3cb907cd6f13bbba8
     and 55baaf0245d63854fcce5ac1b626215d06c99ce1
---

4a23611f8a6c27539253019a8ab581e7fc6ccfd4