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)
commitbb16ee90c7dfc0cdfd1cd29507467edf3a5be32d
tree9d759cdc4f039ab3fb1c8c53bb3c95a803a7cfae
parenteadea0d08eff83301e8dadf3a46fe493aa7894aa
parentd20dfc275d58640efd4a48fd0d5df9947b948669
merge of 1b17d5ea0903d185ff79427f6672db4ae5d2bb71
     and eb1daf075f0b4e388a5f746d0c17cef007acb4aa