From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 13 Dec 2006 22:32:27 +0000 (+0000)
Subject: merge of e47e2cfb1bb68664b33b6747d2a734fb45731fc0
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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e122a57f62270b7df69bddcb518300b573939a0b;p=openembedded.git

merge of e47e2cfb1bb68664b33b6747d2a734fb45731fc0
     and a6643180ca721408f70e59e6c4ff918d496563a4
---

e122a57f62270b7df69bddcb518300b573939a0b