From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Thu, 28 Sep 2006 15:42:38 +0000 (+0000)
Subject: merge of '40086c5da432566b67050aa98a809bd2a6dfa5ee'
X-Git-Tag: Release-2010-05/1~9453^2~666^2~10^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=502fa5021d3ed7f40d27d67d1656b9bdd86f017d;p=openembedded.git

Merge ... '40086c5da432566b67050aa98a809bd2a6dfa5ee'
     and 'fdaad16592058e7e3020ce9a75962b0be856a2f6'
---

502fa5021d3ed7f40d27d67d1656b9bdd86f017d