From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 5 Feb 2008 15:06:51 +0000 (+0000)
Subject: merge of '915c245097ab5f04957b45d8b76b60ece103e80d'
X-Git-Tag: Release-2010-05/1~7734^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b600ea2be80e9deb9dd621f83b7bb13e2811b0f;p=openembedded.git

Merge ... '915c245097ab5f04957b45d8b76b60ece103e80d'
     and 'bbd1c5e5e326b89d4cec6873eace6419f6d5130c'
---

4b600ea2be80e9deb9dd621f83b7bb13e2811b0f