From: Koen Kooi <koen@openembedded.org>
Date: Sun, 17 Jun 2007 10:02:32 +0000 (+0000)
Subject: merge of '381f062d9435d56c4a2fe6ab295046be014e94a1'
X-Git-Tag: Release-2010-05/1~8868^2~346^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce8819cf9c39e47d0ae5718e6ed960f773f75c31;p=openembedded.git

Merge ... '381f062d9435d56c4a2fe6ab295046be014e94a1'
     and '636893a3af4e8e5404ce4917f3701dbe8fc0ab46'
---

ce8819cf9c39e47d0ae5718e6ed960f773f75c31