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

Merge ... 'b3b16abcf910c9b1e8e145776848c3272f9d2f6b'
     and 'ba21e3a161774cae87c852e6599fe25b213c438c'
---

00e47f7b0eec8c3ad8b16d64b47ac9a9f558f2ba