From: Koen Kooi <koen@openembedded.org>
Date: Tue, 17 Oct 2006 12:59:38 +0000 (+0000)
Subject: merge of '5112c5ba79fa1a1fc2a20c61652fd3ab8ef6b833'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~131
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5be0719133cbeebdf81aefb74e6ae4320b1a8e54;p=openembedded.git

Merge ... '5112c5ba79fa1a1fc2a20c61652fd3ab8ef6b833'
     and '8b3a67ccc6702adf7417536b79a65639ea24c07b'
---

5be0719133cbeebdf81aefb74e6ae4320b1a8e54