From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Fri, 22 Sep 2006 07:24:24 +0000 (+0000)
Subject: merge of '1b158f684870f3107f58126d4ca5ced24b2c8927'
X-Git-Tag: Release-2010-05/1~9453^2~739
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af4d18186452dd98c27dc6ac933a157d3d63acd0;p=openembedded.git

Merge ... '1b158f684870f3107f58126d4ca5ced24b2c8927'
     and '1ef7e13b3e401c51337c45e399b1788d0deb4286'
---

af4d18186452dd98c27dc6ac933a157d3d63acd0