From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 15 Dec 2006 16:18:39 +0000 (+0000)
Subject: merge of '88df3da823d2bce88856c558a8edb5e19f13c6dc'
X-Git-Tag: Release-2010-05/1~9453^2~129^2~30^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85db90bc0b87436273ac56d20959958d7bb980d2;p=openembedded.git

Merge ... '88df3da823d2bce88856c558a8edb5e19f13c6dc'
     and 'b69e1fa3c948f1b457f68d8dafdae100280874ed'
---

85db90bc0b87436273ac56d20959958d7bb980d2