From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Dec 2005 16:16:45 +0000 (+0000)
Subject: merge of 7c44aa4a133bc4d41a691bad6ecdc5dc886d4737
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaca434fff6601f976edc7ff0e2f75ee45fc619a;p=openembedded.git

merge of 7c44aa4a133bc4d41a691bad6ecdc5dc886d4737
     and d72c18a4bdb40a69e578b041fe714f31487fcb1e
---

eaca434fff6601f976edc7ff0e2f75ee45fc619a