From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 22 Oct 2007 16:32:50 +0000 (+0000)
Subject: merge of '70c98ecabf04e753c02721c28eb68c90f324d6de'
X-Git-Tag: Release-2010-05/1~8464
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2f2f00a308c461500ec72b145cde5fc20717700;p=openembedded.git

Merge ... '70c98ecabf04e753c02721c28eb68c90f324d6de'
     and 'cebb5151b05a1bb90d6e82d3f2b9883930c5dc35'
---

b2f2f00a308c461500ec72b145cde5fc20717700