From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 10 Mar 2007 21:56:44 +0000 (+0000)
Subject: merge of 'e860ab75a9e89dc51e19d030c03457e3d1b0c1ad'
X-Git-Tag: Release-2010-05/1~8868^2~1110^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60e97e4295487c28b96cf0290f2b5cab165904ee;p=openembedded.git

Merge ... 'e860ab75a9e89dc51e19d030c03457e3d1b0c1ad'
     and 'f9f78fead59ee0f7f134452c6f9b8d3e18a26761'
---

60e97e4295487c28b96cf0290f2b5cab165904ee