Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Tue, 3 Jan 2012 10:43:51 +0000 (11:43 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Tue, 3 Jan 2012 10:43:51 +0000 (11:43 +0100)

Trivial merge