Merge branch 'master' of git://git.indexdata.com/m4
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 1 Sep 2011 12:46:16 +0000 (14:46 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 1 Sep 2011 12:46:16 +0000 (14:46 +0200)

Trivial merge