From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 12:17:31 +0000 (+0000)
Subject: merge of 0586723c132fcaccdd651a3c5d8c002f047ae9ed
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~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e23ba5414db61ccfd8a07d7ce59aefa08880053;p=openembedded.git

merge of 0586723c132fcaccdd651a3c5d8c002f047ae9ed
     and f5f0e13e97c221bdaa5281f17bf2ce322fc3ea4b
---

0e23ba5414db61ccfd8a07d7ce59aefa08880053