From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 19 Nov 2007 15:44:32 +0000 (+0000)
Subject: merge of '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
X-Git-Tag: Release-2010-05/1~8340^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04a35a9cbacf37eb512b9260df9b3059948b76aa;p=openembedded.git

Merge ... '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
     and '9ba226be3bc404bdc4a0da2edf0e3b73a2f004e3'
---

04a35a9cbacf37eb512b9260df9b3059948b76aa