From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 28 Jul 2008 22:01:56 +0000 (+0000)
Subject: merge of '0ad423d3482b73008fa7b39e78b0dbc3658cbc50'
X-Git-Tag: Release-2010-05/1~6444
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa689e0c15fc06d6893f8263bd298f4a09058bf1;p=openembedded.git

Merge ... '0ad423d3482b73008fa7b39e78b0dbc3658cbc50'
     and 'a9043ecc52370e4ecf1fd689e40cf12dac122cb9'
---

fa689e0c15fc06d6893f8263bd298f4a09058bf1