From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 29 Feb 2008 19:22:07 +0000 (+0000)
Subject: merge of 'b805c5a50c8090844ec5ef1b84d102464acb782d'
X-Git-Tag: Release-2010-05/1~7572^2~25^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a31a71771de7ddde61e50e44016608364d77e35;p=openembedded.git

Merge ... 'b805c5a50c8090844ec5ef1b84d102464acb782d'
     and 'b875e862e2ccb0103de09d87184dc882abb4a8ad'
---

3a31a71771de7ddde61e50e44016608364d77e35