From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Sun, 17 Dec 2006 15:16:17 +0000 (+0000)
Subject: merge of '0e7cf314445d29e0276495334a084542f8d43c44'
X-Git-Tag: Release-2010-05/1~9453^2~129^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60850c4324979bb622d90639b3f31d8ca0b29de3;p=openembedded.git

Merge ... '0e7cf314445d29e0276495334a084542f8d43c44'
     and '3640a9bf0088e4fec83fb7c5264e759a5cd6291d'
---

60850c4324979bb622d90639b3f31d8ca0b29de3