From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Aug 2006 14:27:22 +0000 (+0000)
Subject: merge of 'bc5087d2ff20b3a1f43d573613a883bbc0594976'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b99c102029cfaaf07aa79eeed43a3d7068bd48b9;p=openembedded.git

Merge ... 'bc5087d2ff20b3a1f43d573613a883bbc0594976'
     and 'dae6d011c2090a45ec8d231d5e568e3e12289f6b'
---

b99c102029cfaaf07aa79eeed43a3d7068bd48b9