From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Jul 2008 18:29:33 +0000 (+0000)
Subject: merge of '981cc5dae86118a7c743b3f8ad711e7763194aae'
X-Git-Tag: Release-2010-05/1~6423^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aa18f979e3ae6014e8303fcd2196e22e8f713df;p=openembedded.git

Merge ... '981cc5dae86118a7c743b3f8ad711e7763194aae'
     and 'e991ee5c3b5bbf092467b905481b36d1fde8d2de'
---

8aa18f979e3ae6014e8303fcd2196e22e8f713df