From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 14 May 2007 11:20:11 +0000 (+0000)
Subject: merge of '05b9706d2b72277e2f1da19e3714cc4a3c8fe9ee'
X-Git-Tag: Release-2010-05/1~8868^2~514
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45de1cf1e067ad5b61e7da0c8bd17adce13298ae;p=openembedded.git

Merge ... '05b9706d2b72277e2f1da19e3714cc4a3c8fe9ee'
     and '2a1de6d722e47e2709e4ae5bb56c646315e2ed63'
---

45de1cf1e067ad5b61e7da0c8bd17adce13298ae