From: Phil Blundell <philb@gnu.org>
Date: Mon, 14 Aug 2006 16:07:24 +0000 (+0000)
Subject: merge of '2a251a71a9f271e9e3c90442f4664989c4200546'
X-Git-Tag: Release-2010-05/1~9453^2~957^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3830a846a0b2cf5eea843897149fe8f0811d34f2;p=openembedded.git

Merge ... '2a251a71a9f271e9e3c90442f4664989c4200546'
     and 'be32f635579fe38afb045ac1745953ca97f2f55a'
---

3830a846a0b2cf5eea843897149fe8f0811d34f2