From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 6 Feb 2006 02:46:40 +0000 (+0000)
Subject: merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2^2~2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13fe1a5480c8bc85a9a751672ae4d5c6295533a0;p=openembedded.git

merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
     and 9fe7f397fe86e4dfdbe20606d124c3211e58b813
---

13fe1a5480c8bc85a9a751672ae4d5c6295533a0