From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Thu, 28 Sep 2006 18:17:29 +0000 (+0000)
Subject: merge of '11eafc7dd646f2c76d8c21ce224e521730ac6a91'
X-Git-Tag: Release-2010-05/1~9453^2~666^2~8^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0f3ad77a8078163959067e1b15e7b446fd0fa89;p=openembedded.git

Merge ... '11eafc7dd646f2c76d8c21ce224e521730ac6a91'
     and 'dabb67bf3eb39cc2ba26d3beb69b313a14f1da7b'
---

c0f3ad77a8078163959067e1b15e7b446fd0fa89