Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Fri, 27 Jul 2012 16:21:24 +0000 (18:21 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Fri, 27 Jul 2012 16:21:28 +0000 (18:21 +0200)
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

Trivial merge