# HG changeset patch
# User Chris Cannam
# Date 1292506163 0
# Node ID 98b2834d136b3339d186b0c491cd2658e110275d
# Parent  aea1779e6f1817aa4146b725b54c33ccda148c41# Parent  74cb18079dd653dabb77cfea7f665004da2e81f8
Merge from branch "cannam".  Includes changes merged previously from luisf branch to provide user description field etc.