From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Nov 2005 13:46:05 +0000 (+0000)
Subject: merge of 6ce286acc5aed59832502c3ad006c1d171a4bb5f
X-Git-Tag: Release-2010-05/1~9453^2~3119
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894b7f2a3c1ab1fd49948ae812010d23520fc554;p=openembedded.git

merge of 6ce286acc5aed59832502c3ad006c1d171a4bb5f
     and b053e84187fb373b9060e7a8602747ee924da19f
---

894b7f2a3c1ab1fd49948ae812010d23520fc554