From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Wed, 27 Sep 2006 22:36:33 +0000 (+0000)
Subject: merge of '116ba428c87f76e784d66658ec09b431f15889fa'
X-Git-Tag: Release-2010-05/1~9453^2~676
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a83fffff45b984943a35af53c1d4ddd2b312d7;p=openembedded.git

Merge ... '116ba428c87f76e784d66658ec09b431f15889fa'
     and 'dc9bff2d5c5c9d15c295634de30938d7d01c4a34'
---

f4a83fffff45b984943a35af53c1d4ddd2b312d7