From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 16 Oct 2006 10:40:04 +0000 (+0000)
Subject: merge of '6fcfd7c187e5bfdb019983b87124ddc80af2462d'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~161
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d5766571ab5a002eacce9784fca5c59d9040210;p=openembedded.git

Merge ... '6fcfd7c187e5bfdb019983b87124ddc80af2462d'
     and '9e9e3622c67f2361a31af731db0685c576144665'
---

4d5766571ab5a002eacce9784fca5c59d9040210