From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 22 Mar 2006 19:14:02 +0000 (+0000)
Subject: merge of 5542410cebc875e7fa0cf7df43f77e83dd815ae4
X-Git-Tag: Release-2010-05/1~9453^2~2158^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6687137da9915bddbb43185bf84e197c657afdf1;p=openembedded.git

merge of 5542410cebc875e7fa0cf7df43f77e83dd815ae4
     and acaca3acef59ac42500f2bf124eaed2619fa5046
---

6687137da9915bddbb43185bf84e197c657afdf1