From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 10 Aug 2006 11:19:36 +0000 (+0000)
Subject: merge of 5c865738b86de25a1967c923136fa0cc3cb3e3f7
X-Git-Tag: Release-2010-05/1~9453^2~996^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d7fa04b70bd199a1b14b90a03080be6b4b31bd;p=openembedded.git

merge of 5c865738b86de25a1967c923136fa0cc3cb3e3f7
     and d0c77a4c4d72b3036720b36aef3ddce852ccccda
---

98d7fa04b70bd199a1b14b90a03080be6b4b31bd