Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Fri, 7 Jan 2011 15:04:56 +0000 (16:04 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Fri, 7 Jan 2011 15:05:13 +0000 (16:05 +0100)
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

Trivial merge