From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Mar 2006 12:41:15 +0000 (+0000)
Subject: merge of 29372ce60254772158ba48179cc6d86e4146ee5d
X-Git-Tag: Release-2010-05/1~9453^2~2232^2~32^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086ed8d6c503e03524d821e4b3ee5dabff65a0a4;p=openembedded.git

merge of 29372ce60254772158ba48179cc6d86e4146ee5d
     and f7770d0cea5def0448bd8751b10e1d0ad0835c19
---

086ed8d6c503e03524d821e4b3ee5dabff65a0a4