From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 7 Mar 2008 10:02:19 +0000 (+0000)
Subject: merge of '586ec17f18bdda716ffd9874de3224e053eedf13'
X-Git-Tag: Release-2010-05/1~7548^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee28b993305f819c8509d96df1b44bfe6976af28;p=openembedded.git

Merge ... '586ec17f18bdda716ffd9874de3224e053eedf13'
     and 'b7110cfd27ca2bf8f5d938f1e4ffcaaa6468ea4d'
---

ee28b993305f819c8509d96df1b44bfe6976af28