From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 15 Dec 2006 02:02:20 +0000 (+0000)
Subject: merge of c50c1fd918a553b59bdd3a9a626161f6b7660928
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34e4105833ad6532b56f4f26e89dfeabf653125e;p=openembedded.git

merge of c50c1fd918a553b59bdd3a9a626161f6b7660928
     and f76c23f2cb838ac81c84ddccaa99800c570cb6de
---

34e4105833ad6532b56f4f26e89dfeabf653125e