From: Koen Kooi <koen@openembedded.org>
Date: Fri, 25 Aug 2006 10:16:59 +0000 (+0000)
Subject: merge of '1ee32088f5f2a9a808845cf1074bbe5566d7be4a'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~149^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27d718fcf90567a8be2f694e01a6878d1a070118;p=openembedded.git

Merge ... '1ee32088f5f2a9a808845cf1074bbe5566d7be4a'
     and '6651fb704192756bf7c80d213d5cb1e48a1541dd'
---

27d718fcf90567a8be2f694e01a6878d1a070118