From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 9 Oct 2008 02:50:27 +0000 (+0000)
Subject: merge of '83df338c70f7f4819197794f3daebb64a89fcf0a'
X-Git-Tag: Release-2010-05/1~5850^2~7^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd9b29dbdf3b871551494857a121bec5009d0a4f;p=openembedded.git

Merge ... '83df338c70f7f4819197794f3daebb64a89fcf0a'
     and '9f79c6b2ba1ff673c6a3fa4d02579b720046d1cf'
---

bd9b29dbdf3b871551494857a121bec5009d0a4f