From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Jun 2007 09:06:10 +0000 (+0000)
Subject: merge of '1d05bbd701cd09434dbcc309dc00e37c3f1e2b54'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b058b524ba444a71d3ef6c123dcc76460fee70d;p=openembedded.git

Merge ... '1d05bbd701cd09434dbcc309dc00e37c3f1e2b54'
     and 'b13acb8162da7643f4bf14ef3ed160979530a72f'
---

1b058b524ba444a71d3ef6c123dcc76460fee70d