From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Sep 2005 14:03:50 +0000 (+0000)
Subject: merge of 97de95204fec3ff071576bb50a8f5806ef61b060
X-Git-Tag: Release-2010-05/1~9453^2~3642
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81f8eae17311d69807ef85d3b31cc020c7276d02;p=openembedded.git

merge of 97de95204fec3ff071576bb50a8f5806ef61b060
     and d63c6ca7a0fdf35aeb7c989f1f0ae41798aa3b1f
---

81f8eae17311d69807ef85d3b31cc020c7276d02