From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 Aug 2006 10:46:06 +0000 (+0000)
Subject: merge of 1c1ee208b6391be680819c3195314e833ce96263
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~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4344b45a3ca055513e595fd771906fdd3ae031aa;p=openembedded.git

merge of 1c1ee208b6391be680819c3195314e833ce96263
     and 5ef29a16dd96c72ef0f33bd0f53e06381ba285dd
---

4344b45a3ca055513e595fd771906fdd3ae031aa