From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Jan 2007 15:40:51 +0000 (+0000)
Subject: merge of '2cb5af15b69e039f3a37629ca3a637b05cae7138'
X-Git-Tag: Release-2010-05/1~9453^2~30^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5daaa1d8d43f9a674e86743288d614f61caf453;p=openembedded.git

Merge ... '2cb5af15b69e039f3a37629ca3a637b05cae7138'
     and '7df4ca6e11e270364fe93325b02bd8a2766d3bb4'
---

e5daaa1d8d43f9a674e86743288d614f61caf453