From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 27 Mar 2008 08:37:24 +0000 (+0000)
Subject: merge of 'ab9b6229419038d1cd565f287223b27e8a0ab406'
X-Git-Tag: Release-2010-05/1~7267
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca3cda0f6b37ced3fbc0a19c8e5ef08d170625c0;p=openembedded.git

Merge ... 'ab9b6229419038d1cd565f287223b27e8a0ab406'
     and 'caecf9149b61c5c5db02c83ff3d5d801e1216398'
---

ca3cda0f6b37ced3fbc0a19c8e5ef08d170625c0