From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 24 Dec 2006 17:40:06 +0000 (+0000)
Subject: merge of 8eaefa4f638dc67e29fb59fca3c6a98e4049eb09
X-Git-Tag: Release-2010-05/1~9453^2~118
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48d622333374e9d674429c14f472abc0966c272a;p=openembedded.git

merge of 8eaefa4f638dc67e29fb59fca3c6a98e4049eb09
     and f6f04acc928b89f8740f4f2ef14b479a36781bc5
---

48d622333374e9d674429c14f472abc0966c272a