From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 11 Jun 2008 15:54:10 +0000 (+0000)
Subject: merge of '716838c61d439ea48ec596bb358e6fe8674c26fe'
X-Git-Tag: Release-2010-05/1~6768^2~7^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ea2a3eacf6bd7f2bd8be28db697fa3c6c8fb2dd;p=openembedded.git

Merge ... '716838c61d439ea48ec596bb358e6fe8674c26fe'
     and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'
---

0ea2a3eacf6bd7f2bd8be28db697fa3c6c8fb2dd