From: Mike Westerhof <mwester@dls.net>
Date: Thu, 28 Jun 2007 14:38:44 +0000 (+0000)
Subject: merge of '78d052f85b4140a16dabac52589d626ae16d49b2'
X-Git-Tag: Release-2010-05/1~8868^2~268^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3f15c7e0b238ccc6e8e212a9147bef8e6982e05;p=openembedded.git

Merge ... '78d052f85b4140a16dabac52589d626ae16d49b2'
     and 'd85165b6d72282ba94622c1c0d0c9c3e4a6be821'
---

f3f15c7e0b238ccc6e8e212a9147bef8e6982e05