From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Tue, 20 Nov 2007 08:18:15 +0000 (+0000)
Subject: merge of '665b4cb1684c47ed44b254783ed9a928b4bfc1a0'
X-Git-Tag: Release-2010-05/1~8333
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eef1a8eeebf07e608d02f1f2861a7baf1b93644;p=openembedded.git

Merge ... '665b4cb1684c47ed44b254783ed9a928b4bfc1a0'
     and '9e8440e09dae8ceed07468d5f6a230087ef8d736'
---

6eef1a8eeebf07e608d02f1f2861a7baf1b93644