From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 20 Jul 2005 21:53:39 +0000 (+0000)
Subject: merge of 4a7d921e80850f7a639e03de72acc36c6badae3a
X-Git-Tag: Release-2010-05/1~9453^2~4092
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f15f94e2172ee62bbcef33c6e9fd4bfb03f492e4;p=openembedded.git

merge of 4a7d921e80850f7a639e03de72acc36c6badae3a
     and e29528cd2e6cd7c36e18b6318938ec5cbb2c01db
---

f15f94e2172ee62bbcef33c6e9fd4bfb03f492e4