From: Martin Dietze <di@fh-wedel.de>
Date: Wed, 18 Apr 2007 17:14:11 +0000 (+0000)
Subject: merge of '2620a9b57f6ef565cef134f6a34c2a51381ac2e3'
X-Git-Tag: Release-2010-05/1~8868^2~687^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd06e9a14b39a2132c5689fc36dd785132839aff;p=openembedded.git

Merge ... '2620a9b57f6ef565cef134f6a34c2a51381ac2e3'
     and '29e9fec80f07c69a19d9942792954c2d692e7d13'
---

fd06e9a14b39a2132c5689fc36dd785132839aff