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

Merge ... '1cd257c57e952cce419bacf94a4f03a148fcd17d'
     and '6be389aa528c943664977e1ac710bfd80cfd5a36'
---

fb92a644ecca72e97196718969115af7fd6bc837