merge of 9c6d2f9ed3be4745760b4dcd14811587f4acd623
authorGraeme Gregory <dp@xora.org.uk>
Tue, 17 Jan 2006 16:18:24 +0000 (16:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 17 Jan 2006 16:18:24 +0000 (16:18 +0000)
     and b78c38c1ca7715097407f79c1f432372e7b8c258


Trivial merge