From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 10 Jan 2008 14:33:55 +0000 (+0000)
Subject: merge of 'b40ff574864609e2e568aaadd2819286b3608596'
X-Git-Tag: Release-2010-05/1~7890^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a16a829c4ef2335c75ff45591c71b891e2a4ebe8;p=openembedded.git

Merge ... 'b40ff574864609e2e568aaadd2819286b3608596'
     and 'ea02b45427ce0c5be80c8d3e8e927a9d71168320'
---

a16a829c4ef2335c75ff45591c71b891e2a4ebe8