From: Mike Westerhof <mwester@dls.net>
Date: Mon, 13 Oct 2008 16:58:08 +0000 (+0000)
Subject: merge of '32e97ff195b391fe0a9c6e1af5eada1538dbfa52'
X-Git-Tag: Release-2010-05/1~5828
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87638d0e82a81c8a6cb32a5041ec40d41e05e45;p=openembedded.git

Merge ... '32e97ff195b391fe0a9c6e1af5eada1538dbfa52'
     and '7cb0692da0f14131ab23beef52a20dd492fe8312'
---

b87638d0e82a81c8a6cb32a5041ec40d41e05e45