From: Mike Westerhof <mwester@dls.net>
Date: Mon, 2 Jul 2007 17:06:10 +0000 (+0000)
Subject: merge of '130c4c25e5d2d96f1ac7b74c68405c8a6e8b764d'
X-Git-Tag: Release-2010-05/1~8868^2~251
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59c5c58044f29d70d779823bbe62b5b64c4f7304;p=openembedded.git

Merge ... '130c4c25e5d2d96f1ac7b74c68405c8a6e8b764d'
     and 'b783e6b6c66f2dedfc04da8ff6b9b748752c7400'
---

59c5c58044f29d70d779823bbe62b5b64c4f7304