From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 11 Dec 2006 20:17:42 +0000 (+0000)
Subject: merge of 89b615f68e4d28221c572c377d078083b36765ba
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~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2~4^2^2^2~1^2~2^2~1^2~1^2^2~1^2^2^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba04001af57fd3ce90494c750e273bd715d775db;p=openembedded.git

merge of 89b615f68e4d28221c572c377d078083b36765ba
     and d3a4f1285a8d621925836a8a2ea609ea62d1cc9d
---

ba04001af57fd3ce90494c750e273bd715d775db