From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 6 Dec 2007 12:20:20 +0000 (+0000)
Subject: merge of '603c8ef5e6749172e5aa6e43bec74c93211b8682'
X-Git-Tag: Release-2010-05/1~8202^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b79a6c8c464f07b585bb42dd3d4e12be8c6f1eb;p=openembedded.git

Merge ... '603c8ef5e6749172e5aa6e43bec74c93211b8682'
     and 'a0498b1070ee87d8aa57c6ebb87c6bb5b8b8a2f8'
---

9b79a6c8c464f07b585bb42dd3d4e12be8c6f1eb