From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Jun 2007 23:57:27 +0000 (+0000)
Subject: merge of '8b37dea089f02d115ec3e3af14478ea8264ad822'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3962fe5456f1fb1c9020293707bd1ab6ea9d9531;p=openembedded.git

Merge ... '8b37dea089f02d115ec3e3af14478ea8264ad822'
     and 'cc77b9d135248dc8b58b6894e8ed95dcbd474752'
---

3962fe5456f1fb1c9020293707bd1ab6ea9d9531