From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 18 Dec 2006 12:42:30 +0000 (+0000)
Subject: merge of '376e6271722a4507ea977a475f9ff512db8e21d2'
X-Git-Tag: Release-2010-05/1~9453^2~125^2~24^2~14^2~11^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=302f1878f6adacd506a24dd55fecc262a57bf61e;p=openembedded.git

Merge ... '376e6271722a4507ea977a475f9ff512db8e21d2'
     and 'da6646149e7acfedf7008af8e7c94f36f25654da'
---

302f1878f6adacd506a24dd55fecc262a57bf61e