From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 17 Aug 2006 13:31:11 +0000 (+0000)
Subject: merge of 1a4a3b2be416c7c4f63918779f9d0ee5704745df
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=900df1e3b926b4921d37adefbf5a5ad026762306;p=openembedded.git

merge of 1a4a3b2be416c7c4f63918779f9d0ee5704745df
     and 71285c8ccfb20a1c79aa1f0d07a6c2effa514107
---

900df1e3b926b4921d37adefbf5a5ad026762306