From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 28 Dec 2006 03:05:16 +0000 (+0000)
Subject: merge of 7f3e4e4b673d55d27ea70c09699c29ae8871a6f5
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=453aee654209690c139b117279d36f9bfb65232f;p=openembedded.git

merge of 7f3e4e4b673d55d27ea70c09699c29ae8871a6f5
     and fa035be1706e862ac68978c56244a9f0ffb0f1b8
---

453aee654209690c139b117279d36f9bfb65232f