From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 10 May 2008 10:40:08 +0000 (+0000)
Subject: merge of '6b8d4471bfe6d9138ccf94a69cd303cb0a3be76e'
X-Git-Tag: Release-2010-05/1~6969
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7463a61bdb5c13e89bed8c42bc83f99a240c4b3;p=openembedded.git

Merge ... '6b8d4471bfe6d9138ccf94a69cd303cb0a3be76e'
     and 'a627b889876536acc68ef593eff0784aa12340fa'
---

d7463a61bdb5c13e89bed8c42bc83f99a240c4b3