From: Martin Dietze <di@fh-wedel.de>
Date: Fri, 8 Sep 2006 13:18:53 +0000 (+0000)
Subject: merge of '6b1d2d29b75614981eb6f61a01a5e5ccf2a065f1'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd3949a3831e1790d3669ee3e4cde61cfe221103;p=openembedded.git

Merge ... '6b1d2d29b75614981eb6f61a01a5e5ccf2a065f1'
     and 'e469bf244bad64c70f8175ad971b2d9a83365bec'
---

cd3949a3831e1790d3669ee3e4cde61cfe221103