Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Tue, 14 Feb 2012 23:22:47 +0000 (00:22 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Tue, 14 Feb 2012 23:22:47 +0000 (00:22 +0100)

Trivial merge