From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 21 Jun 2006 08:17:46 +0000 (+0000)
Subject: merge of 0e9d72f51e2b65b5d2ccc5321b4872af899180c6
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf4e0e40139b5127918c03bdaedd8f7570efaece;p=openembedded.git

merge of 0e9d72f51e2b65b5d2ccc5321b4872af899180c6
     and c5acd74e482d1e7de50bea58a79d8784225f2e5e
---

cf4e0e40139b5127918c03bdaedd8f7570efaece