From: Phil Blundell <philb@gnu.org>
Date: Thu, 21 Aug 2008 21:14:49 +0000 (+0000)
Subject: merge of '42bf6e48b1c776ec48b21ce58948bf1ef7ae2fed'
X-Git-Tag: Release-2010-05/1~6293^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13bdf166cb63d57f2941da6cfbc4f0cbac59f25c;p=openembedded.git

Merge ... '42bf6e48b1c776ec48b21ce58948bf1ef7ae2fed'
     and '971150ae9b5ea5ece65d001e9966bb32966d3700'
---

13bdf166cb63d57f2941da6cfbc4f0cbac59f25c