From: Koen Kooi <koen@openembedded.org>
Date: Mon, 8 Oct 2007 09:36:59 +0000 (+0000)
Subject: merge of 'c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~113^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5db7b190c127908b9abc9cfe3ad462c83e763f4b;p=openembedded.git

Merge ... 'c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2'
     and 'd8fef75e4f14930650c56b6cce60305fe236f93e'
---

5db7b190c127908b9abc9cfe3ad462c83e763f4b