From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 11 Jul 2005 19:09:47 +0000 (+0000)
Subject: merge of 7430926321bc8eda58a2626237cfc7553ed88d97
X-Git-Tag: Release-2010-05/1~9453^2~4191^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d7e4f50f9d5f5fa6109aa8d258491e81e2fd6df;p=openembedded.git

merge of 7430926321bc8eda58a2626237cfc7553ed88d97
     and dd3df045e5a88aee7e517c086ff8c17774356ba4
---

7d7e4f50f9d5f5fa6109aa8d258491e81e2fd6df