From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Sat, 23 Sep 2006 15:44:37 +0000 (+0000)
Subject: merge of '4ed867356aa513df5383618b7b7dbfe95e1a60f3'
X-Git-Tag: Release-2010-05/1~9453^2~728
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81871146fc44e7bfb8994d72179f1d2b18234f46;p=openembedded.git

Merge ... '4ed867356aa513df5383618b7b7dbfe95e1a60f3'
     and '61fe964a3f1677ae14fdaf18662f4d14b4613bb1'
---

81871146fc44e7bfb8994d72179f1d2b18234f46