From: Koen Kooi <koen@openembedded.org>
Date: Sun, 3 Dec 2006 22:24:34 +0000 (+0000)
Subject: merge of '8c4d9d143b3386e8a9e062fd8917459f5b7958a2'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa0a41bb546c9e7acb587c23f49970c888c56f2b;p=openembedded.git

Merge ... '8c4d9d143b3386e8a9e062fd8917459f5b7958a2'
     and 'd6c00f5b34119df40f96e1c430057fead9087b1a'
---

aa0a41bb546c9e7acb587c23f49970c888c56f2b