From: Phil Blundell <philb@gnu.org>
Date: Sun, 27 Jul 2008 10:46:02 +0000 (+0000)
Subject: merge of '0f42cd616108360d027b0381a276d5b1a3cf26fa'
X-Git-Tag: Release-2010-05/1~6454^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=950a8a787ebd715a4e5c27d05a797de36b6ce769;p=openembedded.git

Merge ... '0f42cd616108360d027b0381a276d5b1a3cf26fa'
     and '1be001dbcc12db3d86ea2666b2fde9a5fa4bddb6'
---

950a8a787ebd715a4e5c27d05a797de36b6ce769