merge of 36b037a423c8b35b017dc3b821094d570ea82d5a
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jan 2006 16:17:25 +0000 (16:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 16:17:25 +0000 (16:17 +0000)
     and fa2f4d331a36d371e62aa55ceccfe3ec1383bf08


Trivial merge