From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 26 Jul 2006 11:10:31 +0000 (+0000)
Subject: merge of 40ffcb28674b0379d85d2300df7adae976966f00
X-Git-Tag: Release-2010-05/1~9453^2~1116^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b242f5e6be540134f5752a88da513e3422295ac;p=openembedded.git

merge of 40ffcb28674b0379d85d2300df7adae976966f00
     and 7a85c145ad6d7d353ef93f13aad28fc3b3146471
---

1b242f5e6be540134f5752a88da513e3422295ac