From: Koen Kooi <koen@openembedded.org>
Date: Fri, 1 Jun 2007 15:01:26 +0000 (+0000)
Subject: merge of '1f4e0f888e7980338bb85c2dec1e2387e28fc91b'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~106^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=261b9ad61fd9a039489b8432fc26769b4348e548;p=openembedded.git

Merge ... '1f4e0f888e7980338bb85c2dec1e2387e28fc91b'
     and '61320145c8e5ea3c80d409d857d23c62daf28d45'
---

261b9ad61fd9a039489b8432fc26769b4348e548