From: Koen Kooi <koen@openembedded.org>
Date: Fri, 25 Aug 2006 18:15:24 +0000 (+0000)
Subject: merge of '910e407ede2c21fb664e4341b86db29ea58c5a5e'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~59^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6f6f141d361cce8a91160939403527082ef22c0;p=openembedded.git

Merge ... '910e407ede2c21fb664e4341b86db29ea58c5a5e'
     and 'd6f3bb8607dabe43539791a91bd897b0f9089cf2'
---

b6f6f141d361cce8a91160939403527082ef22c0