Merge branch 'master' into yaz_663
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 31 May 2013 21:21:46 +0000 (23:21 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 31 May 2013 21:21:46 +0000 (23:21 +0200)

Trivial merge