Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 3 Nov 2011 14:54:42 +0000 (15:54 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 3 Nov 2011 14:54:42 +0000 (15:54 +0100)

Trivial merge