Merge branch 'maint'
commit1e2c039132d11a12fc55b04784a7a67fee765c75
authorSven Verdoolaege <skimo@kotnet.org>
Fri, 7 Jan 2011 15:04:56 +0000 (7 16:04 +0100)
committerSven Verdoolaege <skimo@kotnet.org>
Fri, 7 Jan 2011 15:05:13 +0000 (7 16:05 +0100)
tree018292baab5b5cebc9f65aef105fe1639971607e
parent0f646f8e1e9349930bfee1a9792212394e88759c
parent1b8ac0a9994ee0efa9285cdc0adbfec5393fc0ed
Merge branch 'maint'

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>