merge of ca44dbdae3cd2507c9be579eafbacd0e07bcca43
authorGraeme Gregory <dp@xora.org.uk>
Mon, 18 Jul 2005 11:35:28 +0000 (11:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Jul 2005 11:35:28 +0000 (11:35 +0000)
     and efd8c005871477b3c2788c1257799459527dd028


Trivial merge