From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 26 Mar 2007 20:27:34 +0000 (+0000)
Subject: merge of '33ef958347850ae3830b2326a4476282484717bd'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~10^2~1^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77a7dcd1fd24a8f874666505611c78a667f7e1a5;p=openembedded.git

Merge ... '33ef958347850ae3830b2326a4476282484717bd'
     and 'acf67b94b2b61fe1764206de59d611fab7bc1bea'
---

77a7dcd1fd24a8f874666505611c78a667f7e1a5