From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Sun, 24 Sep 2006 08:31:23 +0000 (+0000)
Subject: merge of '6ff348260412742b1d440ddecd4bbe3ad5355017'
X-Git-Tag: Release-2010-05/1~9453^2~724
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a747852b0b6513b7d884d516b626dcb7fdd0fc0d;p=openembedded.git

Merge ... '6ff348260412742b1d440ddecd4bbe3ad5355017'
     and '853612d1f707239077d79c947a58216f3cb87589'
---

a747852b0b6513b7d884d516b626dcb7fdd0fc0d