From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 09:16:33 +0000 (+0000)
Subject: merge of 923d01265c9550e94062017d7e8ec48225395b06
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~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a5451f0052a66308bf9afe964f95f1be4d6c958;p=openembedded.git

merge of 923d01265c9550e94062017d7e8ec48225395b06
     and f5ac892354e565717a3484ae282835092bf581b3
---

9a5451f0052a66308bf9afe964f95f1be4d6c958