From: Koen Kooi <koen@openembedded.org>
Date: Wed, 15 Nov 2006 22:47:14 +0000 (+0000)
Subject: merge of '60961ec466bc4987a9fab147de3b7703dfe6317f'
X-Git-Tag: Release-2010-05/1~9453^2~465
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db90c2e6b62dc803a50ee5587db177f6039c0ee2;p=openembedded.git

Merge ... '60961ec466bc4987a9fab147de3b7703dfe6317f'
     and '8de3a261a06263fdf455610b427ac1a092b1acf8'
---

db90c2e6b62dc803a50ee5587db177f6039c0ee2