Merge branch 'master' of git://git.indexdata.com/m4
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 16 Jun 2011 08:02:42 +0000 (10:02 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 16 Jun 2011 08:02:42 +0000 (10:02 +0200)

Trivial merge