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

Merge ... '13e3b90d95842d6605bb97abd2e75c521fcc90ea'
     and 'ddead9a9354451fc8ee51dad429309707f005db3'
---

34f3007a55743559d01dafc65bebd95c3c947933