From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Jun 2007 10:36:49 +0000 (+0000)
Subject: merge of '6751c33f46b4e65f3b35180979c5046f64ffb938'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f6d90f7352a2ddbf660afcf9803942cc74f084d;p=openembedded.git

Merge ... '6751c33f46b4e65f3b35180979c5046f64ffb938'
     and 'f5d5ad96ac7c6449a62ad6a934afb8a2659519ed'
---

4f6d90f7352a2ddbf660afcf9803942cc74f084d