From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 11:47:06 +0000 (+0000)
Subject: merge of 7e16c38efab413bbc5aae462f2ccd44bc020978e
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b4f4d38b175772fa9240cdcec9da4b4b89383ab;p=openembedded.git

merge of 7e16c38efab413bbc5aae462f2ccd44bc020978e
     and 88f23c1f27e2ce6305df9bfc94f775eaddd0ae63
---

4b4f4d38b175772fa9240cdcec9da4b4b89383ab