From: Mike Westerhof <mwester@dls.net>
Date: Tue, 2 Jan 2007 23:44:13 +0000 (+0000)
Subject: merge of '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
X-Git-Tag: Release-2010-05/1~9453^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=506d571404e4d23e513dae544c3963882c082c0e;p=openembedded.git

Merge ... '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
     and '79b37f286afab909bc3f1f60b70ee2f4b2b54cbb'
---

506d571404e4d23e513dae544c3963882c082c0e