From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 10 Oct 2005 12:21:27 +0000 (+0000)
Subject: merge of 68390b70af2829661023742b004679b066e6527f
X-Git-Tag: Release-2010-05/1~9453^2~3289
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e660f85d5e0c0a21b5dddb0b91e31c151ad235;p=openembedded.git

merge of 68390b70af2829661023742b004679b066e6527f
     and ccd148440f2ff94def2106f7566d0582e81a7e95
---

49e660f85d5e0c0a21b5dddb0b91e31c151ad235