From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 16 Aug 2006 12:16:14 +0000 (+0000)
Subject: merge of bcb3d8772e830e87eeb88e0a5f581690f6d0cc6f
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^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25ecd232a48b1344879aa941195924c441090073;p=openembedded.git

merge of bcb3d8772e830e87eeb88e0a5f581690f6d0cc6f
     and bf613eac27975ea97757976c79ee18bb255ed21e
---

25ecd232a48b1344879aa941195924c441090073