From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 21 May 2006 07:29:18 +0000 (+0000)
Subject: merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
X-Git-Tag: Release-2010-05/1~9453^2~1553^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83f590bd8e1b243795ef7a9008608bf1225a5bd8;p=openembedded.git

merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
     and 56a0604f9c781a8ef31f72bb644f11624c80b6e7
---

83f590bd8e1b243795ef7a9008608bf1225a5bd8