Merge branch 'master' of git://git.indexdata.com/m4
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 15 Mar 2011 10:23:33 +0000 (11:23 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 15 Mar 2011 10:23:33 +0000 (11:23 +0100)

Trivial merge