From: Philip Balister <philip@balister.org>
Date: Thu, 19 Oct 2006 13:37:51 +0000 (+0000)
Subject: merge of '576d11411cdf287490200b3387241d0bf692b87e'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~94
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a707b232b5a65e7c7a76649f90c1390e438da60;p=openembedded.git

Merge ... '576d11411cdf287490200b3387241d0bf692b87e'
     and 'b5894c077f731887492849019b4bde9fef49101a'
---

2a707b232b5a65e7c7a76649f90c1390e438da60