From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 15 May 2006 10:07:06 +0000 (+0000)
Subject: merge of 4689c198b9377662259edcd5ff48375cfb709ee8
X-Git-Tag: Release-2010-05/1~9453^2~1696^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=768983d3ad295a7367866b02a907b49e47f1b2e0;p=openembedded.git

merge of 4689c198b9377662259edcd5ff48375cfb709ee8
     and 844655bde85aa0ff998861d8efaf849b632b4b66
---

768983d3ad295a7367866b02a907b49e47f1b2e0