From: Phil Blundell <philb@gnu.org>
Date: Mon, 22 Jan 2007 09:49:26 +0000 (+0000)
Subject: merge of '73d0f834a1f30cd2998b071506e97af8d849f977'
X-Git-Tag: Release-2010-05/1~9352^2~20^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6acce0eb39f2f7cf47dc01282151a8e9fe7ddb05;p=openembedded.git

Merge ... '73d0f834a1f30cd2998b071506e97af8d849f977'
     and 'a011f99d8663ce45f2473866131d2b49f5701ed5'
---

6acce0eb39f2f7cf47dc01282151a8e9fe7ddb05