From: Philip Balister <philip@balister.org>
Date: Thu, 23 Nov 2006 14:06:37 +0000 (+0000)
Subject: merge of '4d957b0f42712e699ac776282979b42345af9a76'
X-Git-Tag: Release-2010-05/1~9453^2~318
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf3b83e69b6c266d7ab57fcc62dd0b3b27ee131a;p=openembedded.git

Merge ... '4d957b0f42712e699ac776282979b42345af9a76'
     and 'ba7ea90e82b9377a89dcab04346d4c86eee0f6df'
---

bf3b83e69b6c266d7ab57fcc62dd0b3b27ee131a