From: Philippe De Swert <philippedeswert@scarlet.be>
Date: Wed, 18 Apr 2007 17:14:58 +0000 (+0000)
Subject: merge of '3387d5275b731c38ee945a83c391a2cc78cbc1a8'
X-Git-Tag: Release-2010-05/1~8868^2~687^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1f56acc1b2aa9819927ac52d697bc8baeadf90;p=openembedded.git

Merge ... '3387d5275b731c38ee945a83c391a2cc78cbc1a8'
     and '699c2c7a608569e8c0f66321183fdc3846699014'
---

ac1f56acc1b2aa9819927ac52d697bc8baeadf90