Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
authorMike Taylor <mike@indexdata.com>
Wed, 24 Aug 2011 14:03:17 +0000 (15:03 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 24 Aug 2011 14:03:17 +0000 (15:03 +0100)

Trivial merge