From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sat, 4 Feb 2006 00:06:36 +0000 (+0000)
Subject: merge of 35bf847ec624a472e7754b8b62294721f8d0d281
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68bbf3db1f5e24adc9e759bf0dd0274cbcd67910;p=openembedded.git

merge of 35bf847ec624a472e7754b8b62294721f8d0d281
     and a2bad5c04285fc3770315adbf676c5448eba58e5
---

68bbf3db1f5e24adc9e759bf0dd0274cbcd67910