From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 13:46:01 +0000 (+0000)
Subject: merge of '1f8bedd057ba33e70fd11091f9d542d6c680cd02'
X-Git-Tag: Release-2010-05/1~9453^2~481^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=033cd72ff9e485ba8b098392e10b8ee23e82f21d;p=openembedded.git

Merge ... '1f8bedd057ba33e70fd11091f9d542d6c680cd02'
     and '8345565aba9dd2a72e19d84ff810f1df2f41789b'
---

033cd72ff9e485ba8b098392e10b8ee23e82f21d