From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 2 Dec 2005 19:47:27 +0000 (+0000)
Subject: merge of 1a53338723a901530b07e1eac0618766e5a08768
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfc9db6a35a610f97520dc9e98dd3539eb9603cb;p=openembedded.git

merge of 1a53338723a901530b07e1eac0618766e5a08768
     and 36a0db81b275e4bbad8a100cb3cb8c69c72fe476
---

bfc9db6a35a610f97520dc9e98dd3539eb9603cb