From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Aug 2006 16:08:02 +0000 (+0000)
Subject: merge of '3b5717e88b7dc6248a4a04b0383da3e66cb7e025'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=646df81c739bf416fb8ec144bc11eb555dcc0cac;p=openembedded.git

Merge ... '3b5717e88b7dc6248a4a04b0383da3e66cb7e025'
     and '4b00e5d9fb0f4824f24d6a7a5ba99b8f6b40d677'
---

646df81c739bf416fb8ec144bc11eb555dcc0cac