From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 29 Nov 2006 06:41:36 +0000 (+0000)
Subject: merge of '9e630059a4b5a01df2ca930af52243eb89cb3934'
X-Git-Tag: Release-2010-05/1~9453^2~232^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329a10af450b77aa30e618fd652c00aaf75c0c67;p=openembedded.git

Merge ... '9e630059a4b5a01df2ca930af52243eb89cb3934'
     and 'b8a61703b8f66e806f4a8f08ec9b1a15ab8975c6'
---

329a10af450b77aa30e618fd652c00aaf75c0c67