From: Koen Kooi <koen@openembedded.org>
Date: Thu, 4 Sep 2008 10:19:05 +0000 (+0000)
Subject: merge of '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
X-Git-Tag: Release-2010-05/1~6161^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c432184fd049be1ae22d659911d260e82deffa2;p=openembedded.git

Merge ... '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
     and '9ead7c7a970fd9cac9a8f7314036254e85d786dc'
---

2c432184fd049be1ae22d659911d260e82deffa2