Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Mon, 16 Jul 2012 11:09:19 +0000 (13:09 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Mon, 16 Jul 2012 11:09:46 +0000 (13:09 +0200)
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

Trivial merge