From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 6 Jul 2006 16:14:47 +0000 (+0000)
Subject: merge of 146608cb9e3b0c4ee68e611a117558706e6cbecb
X-Git-Tag: Release-2010-05/1~9453^2~1314
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d5f6d0dd32f5f3378c9692c362a204e804f5250;p=openembedded.git

merge of 146608cb9e3b0c4ee68e611a117558706e6cbecb
     and 6daf673dad5c7bf9a40a8de599ddd3e43c9c2a65
---

9d5f6d0dd32f5f3378c9692c362a204e804f5250