Merge branch 'yaz-770' of ssh://git.indexdata.com/home/git/pub/yaz into yaz-770
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Jun 2014 12:36:47 +0000 (14:36 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Jun 2014 12:36:47 +0000 (14:36 +0200)

Trivial merge