From: Koen Kooi <koen@openembedded.org>
Date: Thu, 26 Oct 2006 16:16:11 +0000 (+0000)
Subject: merge of 'd0a5769f631be6669cccf0f43f7161eb8c9b64a1'
X-Git-Tag: Release-2010-05/1~9453^2~573^2^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329118b32306f397cf5a8f39ff9e92544b33395b;p=openembedded.git

Merge ... 'd0a5769f631be6669cccf0f43f7161eb8c9b64a1'
     and 'f4f9a857ac1b912526c513320ec90f90bea87d37'
---

329118b32306f397cf5a8f39ff9e92544b33395b