From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 19 Aug 2006 13:16:01 +0000 (+0000)
Subject: merge of 1356903a17740b20bb7552b94632d9ed22ce77e6
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33ffad4eccd9242c3978d84a31126d766c74d6c5;p=openembedded.git

merge of 1356903a17740b20bb7552b94632d9ed22ce77e6
     and c9627a53aa797e40423af5bd91194eb719fb8d28
---

33ffad4eccd9242c3978d84a31126d766c74d6c5