Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Nov 2011 11:41:25 +0000 (12:41 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Nov 2011 11:41:25 +0000 (12:41 +0100)

Trivial merge