Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 8 Nov 2011 11:15:35 +0000 (12:15 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 8 Nov 2011 11:15:35 +0000 (12:15 +0100)

Trivial merge