From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 8 Feb 2008 09:10:22 +0000 (+0000)
Subject: merge of '68843ccbc1303f0acf6b974257c646058b1a731a'
X-Git-Tag: Release-2010-05/1~7713^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ed9ebf816c2eacdb1dd9733318b51c7c8d6495b;p=openembedded.git

Merge ... '68843ccbc1303f0acf6b974257c646058b1a731a'
     and '7255c9706337fa8c7170d867233d05ae2dd0c459'
---

9ed9ebf816c2eacdb1dd9733318b51c7c8d6495b