From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 29 Aug 2006 19:01:27 +0000 (+0000)
Subject: merge of 269ce8805f00cfdd0e600694a7008d5b867bc235
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~2^2~2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebbf2e6f44c6172be86f9b2aa980bba27350cdc1;p=openembedded.git

merge of 269ce8805f00cfdd0e600694a7008d5b867bc235
     and 773964e4eb4c02c58900ef9f4977458f896ebd7c
---

ebbf2e6f44c6172be86f9b2aa980bba27350cdc1