From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 7 Dec 2007 11:32:06 +0000 (+0000)
Subject: merge of '4705c705c50943ca89b5319ffaaf2a5fce5b7a51'
X-Git-Tag: Release-2010-05/1~8180^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ad421104d07a2ed9b4ecd2b4e36a639b05b5b8;p=openembedded.git

Merge ... '4705c705c50943ca89b5319ffaaf2a5fce5b7a51'
     and 'cc9dbab30759699bd69f7da427983ce6fd2c1afa'
---

f1ad421104d07a2ed9b4ecd2b4e36a639b05b5b8