From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 7 Sep 2006 23:16:35 +0000 (+0000)
Subject: merge of 3f1cab3696a164923f4c6eda73f9cc7edcc1fa96
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac02dff8b5d0aebeb21644ff1c9ebaa33bbb2150;p=openembedded.git

merge of 3f1cab3696a164923f4c6eda73f9cc7edcc1fa96
     and 8e604ecbf7b8dc17cbfdb32aaba484a8c030f7f4
---

ac02dff8b5d0aebeb21644ff1c9ebaa33bbb2150