From: Koen Kooi <koen@openembedded.org>
Date: Sat, 19 May 2007 13:03:00 +0000 (+0000)
Subject: merge of '03587c20291556862ac9f9a01ffae714e148ee09'
X-Git-Tag: Release-2010-05/1~8868^2~434
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db24711119b9338cf8008ae3a062cfa16196b0d7;p=openembedded.git

Merge ... '03587c20291556862ac9f9a01ffae714e148ee09'
     and '9fd173bf23fee5962a344833fe83c655b9212c30'
---

db24711119b9338cf8008ae3a062cfa16196b0d7