From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 27 Jun 2008 18:42:45 +0000 (+0000)
Subject: merge of '0df5b658b96f939f5d3b63df5415ea1d46d83f25'
X-Git-Tag: Release-2010-05/1~6546^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c4fbce5fa2e366111b564983ded5631eb7e2f19;p=openembedded.git

Merge ... '0df5b658b96f939f5d3b63df5415ea1d46d83f25'
     and '31de530bc2ccfc10a0020cfb5eab126481380149'
---

1c4fbce5fa2e366111b564983ded5631eb7e2f19