From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 20 Dec 2006 16:48:31 +0000 (+0000)
Subject: merge of 30aee3e24a6ffac0f9b8ecd6e41bb2695832e73f
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~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b84dfb51034918d0bd8b87fc568645ce27c8964;p=openembedded.git

merge of 30aee3e24a6ffac0f9b8ecd6e41bb2695832e73f
     and 444bcbfe93c363c0aafd996b39f86f12e4834b5a
---

8b84dfb51034918d0bd8b87fc568645ce27c8964