From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 11:10:15 +0000 (+0000)
Subject: merge of '8ed5d1634e5cf85d56285543499643908effdede'
X-Git-Tag: Release-2010-05/1~9453^2~129^2~60
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5123b32f92d24104c325b090bf18f0e82ad087f;p=openembedded.git

Merge ... '8ed5d1634e5cf85d56285543499643908effdede'
     and 'a98e06eb29c0d8f228038acbaf2a660ea5c43fc6'
---

f5123b32f92d24104c325b090bf18f0e82ad087f