From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 2 Apr 2007 14:46:27 +0000 (+0000)
Subject: merge of '5f6162242333485471131d78f950aabf0b553be9'
X-Git-Tag: Release-2010-05/1~8868^2~851^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92d8ea690e564f49520fd3965b48ea7ef07a34de;p=openembedded.git

Merge ... '5f6162242333485471131d78f950aabf0b553be9'
     and '9b61539b8e105d428c07a9a551cc2bec487151bf'
---

92d8ea690e564f49520fd3965b48ea7ef07a34de