From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Jul 2008 12:00:15 +0000 (+0000)
Subject: merge of '87e3cc07eb2fd42d7850e6b0c1f67268404695d0'
X-Git-Tag: Release-2010-05/1~6431
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8f7fcb155f8356afc5143982ecc6f4d80fc182e;p=openembedded.git

Merge ... '87e3cc07eb2fd42d7850e6b0c1f67268404695d0'
     and 'f572f61df65c44a6ea6b9b987560f1edd3171a1b'
---

e8f7fcb155f8356afc5143982ecc6f4d80fc182e