merge of 1b17d5ea0903d185ff79427f6672db4ae5d2bb71
authorGraeme Gregory <dp@xora.org.uk>
Mon, 20 Feb 2006 10:50:46 +0000 (10:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 10:50:46 +0000 (10:50 +0000)
     and eb1daf075f0b4e388a5f746d0c17cef007acb4aa


Trivial merge