From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 31 May 2007 05:16:19 +0000 (+0000)
Subject: merge of '3a83490f3912de8140c15cfc3041c16cc3cb74f9'
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~6^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d85347354a972cf5f85100f91c8b348d32ee3fc9;p=openembedded.git

Merge ... '3a83490f3912de8140c15cfc3041c16cc3cb74f9'
     and 'ca5dc9226a3d88a8ca14e99878453c71cc46a0b4'
---

d85347354a972cf5f85100f91c8b348d32ee3fc9