From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Thu, 28 Sep 2006 14:37:42 +0000 (+0000)
Subject: merge of '132c1b3c5921e1354513f1817b3fc526e0c3d674'
X-Git-Tag: Release-2010-05/1~9453^2~666^2~10^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfa1a378942a6fa992cc5f2ac33966fdf3674473;p=openembedded.git

Merge ... '132c1b3c5921e1354513f1817b3fc526e0c3d674'
     and '8dcac6d1b8811f90c2e9d9ec5bb911e3fc8d9259'
---

cfa1a378942a6fa992cc5f2ac33966fdf3674473