From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Aug 2005 06:45:34 +0000 (+0000)
Subject: merge of d24be3dd6b15a4f285a8f5b7d8ef9311f719b301
X-Git-Tag: Release-2010-05/1~9453^2~4011^2~4^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f34adf222e1e693c05ddf0383ea3b4aa79fe1c07;p=openembedded.git

merge of d24be3dd6b15a4f285a8f5b7d8ef9311f719b301
     and ee2a6db8532b8347f6c34f21d110e391622d3380
---

f34adf222e1e693c05ddf0383ea3b4aa79fe1c07