From: Koen Kooi <koen@openembedded.org>
Date: Mon, 28 Aug 2006 20:57:29 +0000 (+0000)
Subject: merge of 'c1a64808fc49d61ea2634c0c011011da9e5a7886'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~34^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f3fdadd87d7e5cea2bd97454857fbc4fd4018e0;p=openembedded.git

Merge ... 'c1a64808fc49d61ea2634c0c011011da9e5a7886'
     and 'c6503f659bf477fbd684cf50b9a73db2e7af3bbc'
---

4f3fdadd87d7e5cea2bd97454857fbc4fd4018e0