From: Phil Blundell <philb@gnu.org>
Date: Wed, 17 Jan 2007 15:24:31 +0000 (+0000)
Subject: merge of '4f76054a2fbe49f396cba8a3b6ef23027b6eb15d'
X-Git-Tag: Release-2010-05/1~9360^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f305f4b21e651b8bc5cadc79720592302815edf9;p=openembedded.git

Merge ... '4f76054a2fbe49f396cba8a3b6ef23027b6eb15d'
     and '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
---

f305f4b21e651b8bc5cadc79720592302815edf9