From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Dec 2006 04:32:01 +0000 (+0000)
Subject: merge of 697013ca4ccfd6d5f932b43fc1ac5c3dfa38776c
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^2^2~2^2~4^2^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=090f8dc5332008adada0c0e5fb52825343733175;p=openembedded.git

merge of 697013ca4ccfd6d5f932b43fc1ac5c3dfa38776c
     and ab4307bb43ca98194d8a249af907fb7532555b92
---

090f8dc5332008adada0c0e5fb52825343733175