From: Koen Kooi <koen@openembedded.org>
Date: Mon, 11 Sep 2006 08:27:59 +0000 (+0000)
Subject: merge of 'ccc0894b166e387c9e2ae80e0f6e03fee22306d5'
X-Git-Tag: Release-2010-05/1~9453^2~843^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8bf48dd4d5e1487a71e9ea39ddfc4b0c0e93923;p=openembedded.git

Merge ... 'ccc0894b166e387c9e2ae80e0f6e03fee22306d5'
     and 'd2e1959c4d2d8f9a070ee5db2eedd636d8dc687d'
---

b8bf48dd4d5e1487a71e9ea39ddfc4b0c0e93923