From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Dec 2006 03:19:08 +0000 (+0000)
Subject: merge of 2710d036183d5424c82e22efdc8fff1070e81b92
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=597566ddafa8bce9b6dee03b5a82bc6064f7bd45;p=openembedded.git

merge of 2710d036183d5424c82e22efdc8fff1070e81b92
     and c89d1f5c643cdaad7cd8138146cbd5538afcfd20
---

597566ddafa8bce9b6dee03b5a82bc6064f7bd45