From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 20 Feb 2008 16:33:31 +0000 (+0000)
Subject: merge of '985da843108cf6ed11892842f921418171e3d429'
X-Git-Tag: Release-2010-05/1~7649
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92706f4159bbbd015f9b032815589491d8ce08cb;p=openembedded.git

Merge ... '985da843108cf6ed11892842f921418171e3d429'
     and '9a694dbde6dd96803bccae08f8e83850e03f2b58'
---

92706f4159bbbd015f9b032815589491d8ce08cb