From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 20 Mar 2006 11:18:35 +0000 (+0000)
Subject: merge of 599ce309bcded85efa1ed80fedea59fce4bb01ed
X-Git-Tag: Release-2010-05/1~9453^2~2203
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=741855bef6c2ba84ef374d19afba1ad101f4cbf2;p=openembedded.git

merge of 599ce309bcded85efa1ed80fedea59fce4bb01ed
     and a75588bf3d13c632212591d3b3732e536b5910f7
---

741855bef6c2ba84ef374d19afba1ad101f4cbf2