From: Phil Blundell <philb@gnu.org>
Date: Sat, 2 Aug 2008 08:54:39 +0000 (+0000)
Subject: merge of '93e88a1c0fbbb69dbad706857468d431d612b9c9'
X-Git-Tag: Release-2010-05/1~6396
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5850aeeb7d0ccf93e6845855ba9a696016ff6fa7;p=openembedded.git

Merge ... '93e88a1c0fbbb69dbad706857468d431d612b9c9'
     and 'f7aee16bb45052647fd1a8b8b1d5617ec91b95a9'
---

5850aeeb7d0ccf93e6845855ba9a696016ff6fa7