Merge branch 'master' into yaz_663
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 10 Jun 2013 13:36:32 +0000 (15:36 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 10 Jun 2013 13:36:32 +0000 (15:36 +0200)

Trivial merge