From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Oct 2006 12:48:39 +0000 (+0000)
Subject: merge of 27992ad903b456bde0a40788a183fd1b84d95beb
X-Git-Tag: Release-2010-05/1~9453^2~567^2~208
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3042683d893743732d470888e23c8ec0ad5a64e2;p=openembedded.git

merge of 27992ad903b456bde0a40788a183fd1b84d95beb
     and 45a56df6cfb8cc83a1c1f9896a655ddb77db51bc
---

3042683d893743732d470888e23c8ec0ad5a64e2