From: Koen Kooi <koen@openembedded.org>
Date: Wed, 7 Feb 2007 19:51:14 +0000 (+0000)
Subject: merge of '400e309c08a8818180ce9e6440f4695a898cdf83'
X-Git-Tag: Release-2010-05/1~9270^2~2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5b708058f50922ab9af2735b3d21281f3d2d73;p=openembedded.git

Merge ... '400e309c08a8818180ce9e6440f4695a898cdf83'
     and '918e51dad50cec492dd6963b204ad643f9ec7f35'
---

2d5b708058f50922ab9af2735b3d21281f3d2d73