From: Philip Balister <philip@balister.org>
Date: Fri, 20 Oct 2006 19:02:37 +0000 (+0000)
Subject: merge of '5766b94f1120049e60998bb120cf4519a884d89d'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~71^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c38e235695be35e780db6da7b4817c894d84f90;p=openembedded.git

Merge ... '5766b94f1120049e60998bb120cf4519a884d89d'
     and 'a16077ae45108937659058d6916e0e2737965ec7'
---

3c38e235695be35e780db6da7b4817c894d84f90