Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
authorMike Taylor <mike@indexdata.com>
Tue, 5 Jul 2011 22:51:06 +0000 (23:51 +0100)
committerMike Taylor <mike@indexdata.com>
Tue, 5 Jul 2011 22:51:06 +0000 (23:51 +0100)

Trivial merge