From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 20 May 2008 22:52:14 +0000 (+0000)
Subject: merge of '4d6dbbd6409e2a93093659bf415ba3b79f7bc3f6'
X-Git-Tag: Release-2010-05/1~6882^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c915993f17e3e43dcd96e5d1c4ce485963da7d4;p=openembedded.git

Merge ... '4d6dbbd6409e2a93093659bf415ba3b79f7bc3f6'
     and 'b2a4a7fdee4979edfc6a17d3e6ff9a7ffeeb2ab9'
---

7c915993f17e3e43dcd96e5d1c4ce485963da7d4