merge of 01783a925142e303a35b3d5011062c449f634fce
authorGraeme Gregory <dp@xora.org.uk>
Thu, 2 Feb 2006 14:49:37 +0000 (14:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Feb 2006 14:49:37 +0000 (14:49 +0000)
     and 6d8ef5d4947f1ffacac1ee8f3b3dd79e90c4a5ba


Trivial merge