From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 29 Sep 2008 07:40:59 +0000 (+0000)
Subject: merge of '987daa523fa5a5b15abb45b73b13f80aaf25adff'
X-Git-Tag: Release-2010-05/1~5906^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6807c0e4bf6733cb8ae03e0a681457ada33a4ff9;p=openembedded.git

Merge ... '987daa523fa5a5b15abb45b73b13f80aaf25adff'
     and 'e6663f24d6776704d75695cd7b8583024c162c8c'
---

6807c0e4bf6733cb8ae03e0a681457ada33a4ff9