From: Koen Kooi <koen@openembedded.org>
Date: Fri, 30 Jun 2006 09:10:01 +0000 (+0000)
Subject: merge of 214b4c4e7d773cc8d94d28db3d1f88d20f67c976
X-Git-Tag: Release-2010-05/1~9453^2~1400^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2260848cb4198f389ff0a4ae61efafe9bf60d39;p=openembedded.git

merge of 214b4c4e7d773cc8d94d28db3d1f88d20f67c976
     and 75ab5e8a308a9e33d98460b70c311d02f6b50737
---

b2260848cb4198f389ff0a4ae61efafe9bf60d39