merge of bcba7ea1e859a907d265bd56e20c0860217b3728
authorGraeme Gregory <dp@xora.org.uk>
Wed, 1 Mar 2006 16:30:20 +0000 (16:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Mar 2006 16:30:20 +0000 (16:30 +0000)
     and dfe9588c3d838fc005a999a216b1c85f3d4e4e3f


Trivial merge