From: Koen Kooi <koen@openembedded.org>
Date: Wed, 25 Jul 2007 10:19:45 +0000 (+0000)
Subject: merge of 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
X-Git-Tag: Release-2010-05/1~8868^2~88^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b97b206fca43c75ac7098d358bf4c51cd3aed261;p=openembedded.git

Merge ... 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
     and 'a86521780dc35dc231aed40133a626f55b4b3887'
---

b97b206fca43c75ac7098d358bf4c51cd3aed261