From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Mar 2008 15:36:55 +0000 (+0000)
Subject: merge of '8e2516afaaa24a7f517979818ae7304aadb4dbc9'
X-Git-Tag: Release-2010-05/1~7588^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e7ae29a2b6047a7c66b69ffc4c85f7e71958200;p=openembedded.git

Merge ... '8e2516afaaa24a7f517979818ae7304aadb4dbc9'
     and 'f8359facab8aa6b2607db3f4f3d254d7082a48c5'
---

6e7ae29a2b6047a7c66b69ffc4c85f7e71958200