merge of 294149e1b46007db8f485b7af77b7d19aece92c1
authorGraeme Gregory <dp@xora.org.uk>
Mon, 1 Aug 2005 11:46:31 +0000 (11:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 11:46:31 +0000 (11:46 +0000)
     and a7b3addb3bbed05ecfeaadd75fe958bdff42cd8e


Trivial merge