From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 5 Jun 2007 12:03:46 +0000 (+0000)
Subject: merge of '225d874e6be0018719b0a6222b1dd91f19048aad'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~78^2~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17ab397668dace7154cbf7ee860c7c283eb30003;p=openembedded.git

Merge ... '225d874e6be0018719b0a6222b1dd91f19048aad'
     and '755520d5b141a9ba6f14d0230701bb57f3b82bb9'
---

17ab397668dace7154cbf7ee860c7c283eb30003