From: Philip Balister <philip@balister.org>
Date: Mon, 27 Nov 2006 20:46:32 +0000 (+0000)
Subject: merge of 'b1b3feda7d897a425e7e06c085cbfab48b9e4f09'
X-Git-Tag: Release-2010-05/1~9453^2~259^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8c52fc4c7b82f5e4de799d3f37292e8daec6705;p=openembedded.git

Merge ... 'b1b3feda7d897a425e7e06c085cbfab48b9e4f09'
     and 'f364b08c0bec4d1bbd76370204c058f1d372339f'
---

c8c52fc4c7b82f5e4de799d3f37292e8daec6705