merge of 1726259e1307cbf87bc9ff563cd95173caef5310
authorGraeme Gregory <dp@xora.org.uk>
Tue, 16 Aug 2005 14:06:13 +0000 (14:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Aug 2005 14:06:13 +0000 (14:06 +0000)
     and 3b1f1bca981c588da63ebf86ee9412a1c6bd8671


Trivial merge