From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 11 Jan 2008 13:35:31 +0000 (+0000)
Subject: merge of '1c3d9b4f57e46b646e76da9bd9912c26fb17491c'
X-Git-Tag: Release-2010-05/1~7968^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0651d8327b9411c69f23090f4acb13b65a6bd526;p=openembedded.git

Merge ... '1c3d9b4f57e46b646e76da9bd9912c26fb17491c'
     and 'cd99d111a7ff26d5c2ce70771e828004ce3e1f09'
---

0651d8327b9411c69f23090f4acb13b65a6bd526