From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 9 Aug 2005 15:02:25 +0000 (+0000)
Subject: merge of 2f4be4bda0bc32eb72174daa1ac365050b7a9d85
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~22^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff5e3e381f3eaa6eeffc10af9894e64ca98dea07;p=openembedded.git

merge of 2f4be4bda0bc32eb72174daa1ac365050b7a9d85
     and 42695d2917826b4ecd949ee4cce709f6f04fc54c
---

ff5e3e381f3eaa6eeffc10af9894e64ca98dea07