From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 10 May 2007 14:17:23 +0000 (+0000)
Subject: merge of '18d0e9339b2101cf5fd32a7ea23cfd340d4dd6ad'
X-Git-Tag: Release-2010-05/1~8868^2~558^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ed78a09980a1623ef94809196614ddf6a1db748;p=openembedded.git

Merge ... '18d0e9339b2101cf5fd32a7ea23cfd340d4dd6ad'
     and '6e3fcd9a7fed08259809b6192f8fe066a9d6abbd'
---

5ed78a09980a1623ef94809196614ddf6a1db748