From: Mike Westerhof <mwester@dls.net>
Date: Tue, 7 Oct 2008 14:10:11 +0000 (+0000)
Subject: merge of '06439bd12faeb366d7d703a017d5c609d41cb96e'
X-Git-Tag: Release-2010-05/1~5861^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7db59217ec8f6b541ffc22516e3dd4a14b8759d1;p=openembedded.git

Merge ... '06439bd12faeb366d7d703a017d5c609d41cb96e'
     and '8334fa112d76dd1bff6086d9cbd2007755c42e05'
---

7db59217ec8f6b541ffc22516e3dd4a14b8759d1