From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Jan 2006 23:15:28 +0000 (+0000)
Subject: merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57d37948ea19fcd860cd2f5577e828e126e00a77;p=openembedded.git

merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
     and 451d8c0761e16d84691a529f9f26a9989e138fc6
---

57d37948ea19fcd860cd2f5577e828e126e00a77