merge of 68390b70af2829661023742b004679b066e6527f
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 10 Oct 2005 12:21:27 +0000 (12:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Oct 2005 12:21:27 +0000 (12:21 +0000)
     and ccd148440f2ff94def2106f7566d0582e81a7e95


Trivial merge