From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 5 Nov 2005 21:33:43 +0000 (+0000)
Subject: merge of 2b1505a49c1d0539fe1fd18e82311947011facb7
X-Git-Tag: Release-2010-05/1~9453^2~3125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=879670377c7d5626b4f52d9f6d420ba3ceafb770;p=openembedded.git

merge of 2b1505a49c1d0539fe1fd18e82311947011facb7
     and f7112800b1c3c07c41c1b8bc8840029091ce846c
---

879670377c7d5626b4f52d9f6d420ba3ceafb770