From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 1 Aug 2005 11:46:31 +0000 (+0000)
Subject: merge of 294149e1b46007db8f485b7af77b7d19aece92c1
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~19
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96ed417296ded1a1dcc02839ebef0ade909f2a8e;p=openembedded.git

merge of 294149e1b46007db8f485b7af77b7d19aece92c1
     and a7b3addb3bbed05ecfeaadd75fe958bdff42cd8e
---

96ed417296ded1a1dcc02839ebef0ade909f2a8e