From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 24 Jul 2007 12:37:55 +0000 (+0000)
Subject: merge of '2fb7d0fb7f61a54a4005ff8d5cc52a3df21e2692'
X-Git-Tag: Release-2010-05/1~8868^2~95^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2291afee142580fe99e9a3caa7c0521de3d1e7a2;p=openembedded.git

Merge ... '2fb7d0fb7f61a54a4005ff8d5cc52a3df21e2692'
     and 'c52428092b0739e47ca366526bbc7fb05db0b368'
---

2291afee142580fe99e9a3caa7c0521de3d1e7a2