From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Jul 2005 10:08:50 +0000 (+0000)
Subject: merge of bfebd3d0c4433b4848b25fb9db980d0f4ff72242
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~105
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=079c66529741284a4fac91ba5b7ce054d5c97e73;p=openembedded.git

merge of bfebd3d0c4433b4848b25fb9db980d0f4ff72242
     and d959b998d204d201495a32e5bc33b06eecaf6d38
---

079c66529741284a4fac91ba5b7ce054d5c97e73