From: Koen Kooi <koen@openembedded.org>
Date: Wed, 7 Mar 2007 17:12:32 +0000 (+0000)
Subject: merge of '189467654b7dd4ef08fe922c71ecdfe054b0e4dc'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~27^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=498d84d6e0bcf9c597e0c4e95a62c43e60a54ffa;p=openembedded.git

Merge ... '189467654b7dd4ef08fe922c71ecdfe054b0e4dc'
     and 'b71a708b2295b209f7756cd3fbcd4848fb5db788'
---

498d84d6e0bcf9c597e0c4e95a62c43e60a54ffa