From: Koen Kooi <koen@openembedded.org>
Date: Sun, 29 Oct 2006 11:32:36 +0000 (+0000)
Subject: merge of '4d5affce3ba65df3658b9b749b1db11d11ef1d8f'
X-Git-Tag: Release-2010-05/1~9453^2~554^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f57b1caaca53da39b519c31db80e74dc19945394;p=openembedded.git

Merge ... '4d5affce3ba65df3658b9b749b1db11d11ef1d8f'
     and '684595150a0e865a406770102f72a2e93285b9a3'
---

f57b1caaca53da39b519c31db80e74dc19945394