From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 12:16:10 +0000 (+0000)
Subject: merge of 31503632aa868621c7106edd1358385e9c8f4267
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17968114f1f08f2224871e0267ba29b7664b5480;p=openembedded.git

merge of 31503632aa868621c7106edd1358385e9c8f4267
     and 3aca33802c68590787676070907dfe5fc1e18a5e
---

17968114f1f08f2224871e0267ba29b7664b5480