From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 09:41:04 +0000 (+0000)
Subject: merge of 350db4cf328a0f2550fb4212ab191c0d27f9009b
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~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91b85afbbc5c20cb34482d89d839488e31523827;p=openembedded.git

merge of 350db4cf328a0f2550fb4212ab191c0d27f9009b
     and c491123fc7829f3a1f1a3760ec80422581017e3b
---

91b85afbbc5c20cb34482d89d839488e31523827