From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Feb 2008 19:54:11 +0000 (+0000)
Subject: merge of '3f1372952a23092858708c96a555777c98913155'
X-Git-Tag: Release-2010-05/1~7667
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f24ee65782773729769f24f6d69e7e423dc3b0f7;p=openembedded.git

Merge ... '3f1372952a23092858708c96a555777c98913155'
     and '5c877070afbb7851bfc57f33ee001f333b29c5c2'
---

f24ee65782773729769f24f6d69e7e423dc3b0f7