From: Koen Kooi <koen@openembedded.org>
Date: Wed, 29 Nov 2006 11:13:02 +0000 (+0000)
Subject: merge of '566766a2d7562a96a2abccaf2cea055e8c0cbfc6'
X-Git-Tag: Release-2010-05/1~9453^2~236
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12bb4c41c375d36b596ba4eb0a9c8ce1d6ace10e;p=openembedded.git

Merge ... '566766a2d7562a96a2abccaf2cea055e8c0cbfc6'
     and 'efd4f14c4b3b225594b87a854b5848082b05669d'
---

12bb4c41c375d36b596ba4eb0a9c8ce1d6ace10e