From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 17:39:46 +0000 (+0000)
Subject: merge of 5dac0e1b5f9f45a441a326fa1473ba5075ccaa72
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42839f6eb97120eae69e14b3ebcc4b90c12dbf5c;p=openembedded.git

merge of 5dac0e1b5f9f45a441a326fa1473ba5075ccaa72
     and f62e2fac7e13e5139dde0dacbcbda49e2bee246b
---

42839f6eb97120eae69e14b3ebcc4b90c12dbf5c