From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 27 Jan 2006 20:17:22 +0000 (+0000)
Subject: merge of 0aeab38c7b048a94b7c6c7450371d19dd75789fd
X-Git-Tag: Release-2010-05/1~9453^2~2533
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b4dda8d473b75f020e2b279ee06b68378d6c0af;p=openembedded.git

merge of 0aeab38c7b048a94b7c6c7450371d19dd75789fd
     and fe66a2425727029ce88d5665ffd6eee2879ef16f
---

3b4dda8d473b75f020e2b279ee06b68378d6c0af