From: Koen Kooi <koen@openembedded.org>
Date: Fri, 29 Aug 2008 17:40:21 +0000 (+0000)
Subject: merge of '05c8ac666734fffe4be207c184a8d6ec410c203f'
X-Git-Tag: Release-2010-05/1~6196^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aabad5771b24f0da302faf9f396d73dd7166d30;p=openembedded.git

Merge ... '05c8ac666734fffe4be207c184a8d6ec410c203f'
     and 'cdd9d1c543126b02dd14925c940ec6a31e071be8'
---

9aabad5771b24f0da302faf9f396d73dd7166d30