eduardop
committed
on 20 Dec 04
move some logic to last-session