From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 14:47:32 +0000 (+0000)
Subject: merge of 1e94290a7ac169e4fd602f3ed164e96332ec1c9f
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d003c7ceaf132ded2b335b00f05bc5023b04c3cd;p=openembedded.git

merge of 1e94290a7ac169e4fd602f3ed164e96332ec1c9f
     and ab3a01a7cf345a0c6ee0f26d5c46b43fd46da4b1
---

d003c7ceaf132ded2b335b00f05bc5023b04c3cd