From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Aug 2006 13:01:27 +0000 (+0000)
Subject: merge of 2e42416bfdbbc17b0d6d5cd751bb0b542115fc51
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61e1184b7969fbfe23315454cab081fa2e920bc2;p=openembedded.git

merge of 2e42416bfdbbc17b0d6d5cd751bb0b542115fc51
     and 637ca3e6b5d8f03ecbcd50fbb9bcf85ca0a208ab
---

61e1184b7969fbfe23315454cab081fa2e920bc2