From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 17:46:27 +0000 (+0000)
Subject: merge of 151d26e866d1d737b2b9e475f03dd90e70d0ca36
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5688ae31a366518bcfe63c24480a9db3e052aee5;p=openembedded.git

merge of 151d26e866d1d737b2b9e475f03dd90e70d0ca36
     and 8b75fa29eae4798347d843e7178049453168477f
---

5688ae31a366518bcfe63c24480a9db3e052aee5