merge of 520f026b4456efe34f54b717ef077c88acd1b92b
authorGraeme Gregory <dp@xora.org.uk>
Sun, 29 Jan 2006 00:08:38 +0000 (00:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 29 Jan 2006 00:08:38 +0000 (00:08 +0000)
     and df87e4e26b065aa023b3fcb52671304738842030


Trivial merge