From: Philip Balister <philip@balister.org>
Date: Wed, 18 Oct 2006 15:45:25 +0000 (+0000)
Subject: merge of '56cef8ae3fb871ea0976b2101ed9a1aed03270cd'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~102
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35b7e81077aa31a533e6f4250247821a03c296b8;p=openembedded.git

Merge ... '56cef8ae3fb871ea0976b2101ed9a1aed03270cd'
     and 'fedad6b59fb05cfaca2abc090d29b3f03dd2cfee'
---

35b7e81077aa31a533e6f4250247821a03c296b8