From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Sep 2006 02:16:10 +0000 (+0000)
Subject: merge of 0cb2088c75cd013fa4b79bb46028d9d384f0ef81
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~2^2~1^2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=400d72a2a6841617e7dbc1892d5bd0d105c351ec;p=openembedded.git

merge of 0cb2088c75cd013fa4b79bb46028d9d384f0ef81
     and 23cb7a1f5a80af5ac55e94cdb98f756f8c041763
---

400d72a2a6841617e7dbc1892d5bd0d105c351ec