From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Mon, 25 Sep 2006 10:09:04 +0000 (+0000)
Subject: merge of '18329693bf27e4a4c165e8105cc4ecf9477dd53b'
X-Git-Tag: Release-2010-05/1~9453^2~713
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4c0cdb0f3c6a89c1f24efc582221339ecfd3b59;p=openembedded.git

Merge ... '18329693bf27e4a4c165e8105cc4ecf9477dd53b'
     and 'e1007e8f66e600742b6b7b457b3e1fef1cfeb942'
---

d4c0cdb0f3c6a89c1f24efc582221339ecfd3b59