From: Koen Kooi <koen@openembedded.org>
Date: Sun, 13 Jul 2008 14:08:17 +0000 (+0000)
Subject: merge of '1828e091ae06fc2f6f869299de7c7187900c649c'
X-Git-Tag: Release-2010-05/1~6543^2~7^2~32^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03132ae61da2b8331d66c3f6b5ed0190aed26b28;p=openembedded.git

Merge ... '1828e091ae06fc2f6f869299de7c7187900c649c'
     and '54383b7d45cbdbb90ca3491e4a105edd944c66ec'
---

03132ae61da2b8331d66c3f6b5ed0190aed26b28