From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 20 Dec 2006 14:47:19 +0000 (+0000)
Subject: merge of 3805b1ac03600e59e510185d77bdb91333134e1f
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~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f6a4cd002387744f297643e592451b13ea66dc4;p=openembedded.git

merge of 3805b1ac03600e59e510185d77bdb91333134e1f
     and 8e96e2bb9c496749e3561f9bbb1bd1de9ae3258e
---

0f6a4cd002387744f297643e592451b13ea66dc4