merge of 08b99a6246391bc67af5422397346b95d3d3b3e3
authorGraeme Gregory <dp@xora.org.uk>
Mon, 10 Jul 2006 12:29:44 +0000 (12:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Jul 2006 12:29:44 +0000 (12:29 +0000)
     and f3515be6618dd23c0a5917c27c9607c052d6df83


Trivial merge