From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Thu, 28 Sep 2006 19:02:45 +0000 (+0000)
Subject: merge of '1b21921e11ef943e73ab8419dbb13a2761967b0d'
X-Git-Tag: Release-2010-05/1~9453^2~666^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=555a7ba56ee73a04120205f23924ebc9519eaf84;p=openembedded.git

Merge ... '1b21921e11ef943e73ab8419dbb13a2761967b0d'
     and '313162366ea5bd1facacf8ae454aef9119a4eae0'
---

555a7ba56ee73a04120205f23924ebc9519eaf84