Merge branch 'branch_1_4_4'
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Aug 2010 12:28:32 +0000 (14:28 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Aug 2010 12:28:32 +0000 (14:28 +0200)

Trivial merge