From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 26 Dec 2006 18:02:19 +0000 (+0000)
Subject: merge of 84ec571b79ff08dffe361c8e9f9fa61a10ac2380
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50830f6ee18058f9072273be513e906f0e2a2590;p=openembedded.git

merge of 84ec571b79ff08dffe361c8e9f9fa61a10ac2380
     and f3f3d16da35f22b629571ec42fd9f4e74558d6d2
---

50830f6ee18058f9072273be513e906f0e2a2590