From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 4 Sep 2006 11:48:07 +0000 (+0000)
Subject: merge of 2eb3e554331d55cc0f7d813dca896a891a88eead
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52bd0467b0b1596f49eb893125edbe9736a6553d;p=openembedded.git

merge of 2eb3e554331d55cc0f7d813dca896a891a88eead
     and a94af4911a294bcdb04e177bd028dd19a7a36edb
---

52bd0467b0b1596f49eb893125edbe9736a6553d